Merge branch 'master' into testing/no-hard-org-json

# Conflicts:
#	gradle.properties

.github/ISSUE_TEMPLATE/bug-report.md

@@ -27,7 +27,7 @@ assignees: zaze06
 
 **Config**
 *If needed*
-*Use [GitHub Gist](gist.gihub.com) to upload your speedometer config, located in *
+*Use [GitHub Gist](gist.gihub.com) to upload your speedometer config, located in `<minecraft>/config/speedometer/config.json`*
 
 **Logs**
 *If needed(Most of the times)*

Resourcepack/quarter_circle_speedometer/pack.mcmeta

@@ -4,7 +4,7 @@
     "description": "A different speedometer",
     "supported_formats": {
       "min_inclusive": 34,
-      "max_inclusive": 57
+      "max_inclusive": 80
     }
   }
 }

common/src/main/java/me/zacharias/speedometer/Client.java

@@ -6,6 +6,7 @@ import dev.architectury.event.events.client.ClientTickEvent;
 import dev.architectury.platform.Platform;
 import dev.architectury.registry.client.keymappings.KeyMappingRegistry;
 import net.minecraft.ChatFormatting;
+import net.minecraft.CrashReport;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
@@ -23,317 +24,312 @@ import java.util.*;
 import static me.zacharias.speedometer.Speedometer.*;
 
 public class Client {
-  public static final KeyMapping CONFIG_KEY = new KeyMapping(
-      "speedometer.key.configKey",
-      InputConstants.Type.KEYSYM,
-      InputConstants.KEY_O,
-      "speedometer.key.category"
-  );
-  public static final KeyMapping DEBUG_KEY = new KeyMapping(
-      "speedometer.key.debugKey",
-      InputConstants.Type.KEYSYM,
-      InputConstants.KEY_F6,
-      "speedometer.key.category"
-  );
+    public static final KeyMapping CONFIG_KEY = new KeyMapping(
+            "speedometer.key.configKey",
+            InputConstants.Type.KEYSYM,
+            InputConstants.KEY_O,
+            "speedometer.key.category"
+    );
+    public static final KeyMapping DEBUG_KEY = new KeyMapping(
+            "speedometer.key.debugKey",
+            InputConstants.Type.KEYSYM,
+            InputConstants.KEY_F6,
+            "speedometer.key.category"
+    );
 
-  private static final ArrayList<Double> speeds = new ArrayList<>();
+    private static final ArrayList<Double> speeds = new ArrayList<>();
 
 
-  public static void init(){
-    
-    final boolean isClothLoaded = Platform.isModLoaded("cloth_config") || Platform.isModLoaded("cloth-config");
-    
-    if(isClothLoaded) {
-      Platform.getMod(MOD_ID).registerConfigurationScreen(parent -> ConfigMenu.getConfig(parent).build());
-    }
-    else
-    {
-      LOGGER.warn("Missing Cloth Config API, In game config menu will not be available");
-    }
-    
-    KeyMappingRegistry.register(CONFIG_KEY);
-    ClientTickEvent.CLIENT_POST.register(minecraft -> {
-      if(CONFIG_KEY.consumeClick()){
+    public static void init(){
+
+        final boolean isClothLoaded = Platform.isModLoaded("cloth_config") || Platform.isModLoaded("cloth-config");
+
         if(isClothLoaded) {
-          Minecraft.getInstance().setScreen(ConfigMenu.getConfig(Minecraft.getInstance().screen).build());
-        }
-        else if(Minecraft.getInstance().player != null)
-        {
-            Minecraft.getInstance().player.displayClientMessage(
-                Component
-                    .translatable("speedometer.error.missing_cloth")
-                    .withColor(new Color(190, 0, 0).getRGB())
-                    .append(Component
-                        .translatable("speedometer.error.missing_cloth.open_config")
-                        .withStyle(ChatFormatting.UNDERLINE)
-                        .withStyle((style) -> style.withClickEvent(new ClickEvent.OpenFile(Config.getConfigPath())))
-                    ), false);
-          LOGGER.warn(Component.translatable("speedometer.error.missing_cloth").getString());
+            Platform.getMod(MOD_ID).registerConfigurationScreen(parent -> ConfigMenu.getConfig(parent).build());
         }
         else
         {
-          LOGGER.warn(Component.translatable("speedometer.error.missing_cloth").getString());
+            LOGGER.warn("Missing Cloth Config API, In game config menu will not be available");
         }
-      }
-    });
 
-    KeyMappingRegistry.register(DEBUG_KEY);
-    ClientTickEvent.CLIENT_POST.register(minecraft -> {
-      if(DEBUG_KEY.consumeClick()){
-        Config.setDebug(!Config.isDebug());
-      }
-    });
+        KeyMappingRegistry.register(CONFIG_KEY);
+        ClientTickEvent.CLIENT_POST.register(minecraft -> {
+            if(CONFIG_KEY.consumeClick()){
+                if(isClothLoaded) {
+                    Minecraft.getInstance().setScreen(ConfigMenu.getConfig(Minecraft.getInstance().screen).build());
+                }
+                else if(Minecraft.getInstance().player != null)
+                {
+                    Minecraft.getInstance().player.displayClientMessage(
+                            Component
+                                    .translatable("speedometer.error.missing_cloth")
+                                    .withColor(new Color(190, 0, 0).getRGB())
+                                    .append(Component
+                                            .translatable("speedometer.error.missing_cloth.open_config")
+                                            .withStyle(ChatFormatting.UNDERLINE)
+                                            .withStyle((style) -> style.withClickEvent(new ClickEvent.OpenFile(Config.getConfigPath())))
+                                    ), false);
+                    LOGGER.warn(Component.translatable("speedometer.error.missing_cloth").getString());
+                }
+                else
+                {
+                    LOGGER.warn(Component.translatable("speedometer.error.missing_cloth").getString());
+                }
+            }
+        });
 
-    Config.initialize();
-    Config.save();
+        KeyMappingRegistry.register(DEBUG_KEY);
+        ClientTickEvent.CLIENT_POST.register(minecraft -> {
+            if(DEBUG_KEY.consumeClick()){
+                Config.setDebug(!Config.isDebug());
+            }
+        });
 
-    ClientGuiEvent.RENDER_HUD.register(Client::render);
+        Config.initialize();
+        Config.save();
 
-    LOGGER.info("Finished loading speedometer");
-  }
+        ClientGuiEvent.RENDER_HUD.register(Client::render);
 
-  private static void render(GuiGraphics graphics, DeltaTracker deltaTracker) {
-    if(Minecraft.getInstance().player == null) return;
-    if(Minecraft.getInstance().options.hideGui) return;
-    Entity entity = Minecraft.getInstance().player.getRootVehicle();
-
-    Vec3 vec = new Vec3(
-        entity.getX() - entity.xOld,
-        entity.getY() - entity.yOld,
-        entity.getZ() - entity.zOld
-    );
-
-    double yOffset = 0D;
-    double xOffset = 0D;
-    double zOffset = 0D;
-    double vOffset = 0D;
-
-    double speed = (Math.sqrt(Math.pow(vec.x + xOffset, 2) + Math.pow(vec.y + yOffset, 2) + Math.pow(vec.z + zOffset, 2)) * 20)+vOffset;
-    double lSpeed = speed;
-
-    if (speeds.size() >= 30) {
-      speeds.removeFirst();
-    }
-    speeds.add(speed);
-    speed = 0;
-    for (Double aDouble : speeds) {
-      speed += aDouble;
-    }
-    speed = speed / speeds.size();
-
-    double speedTypeSpeed;
-
-    SpeedTypes speedType = Config.getSpeedType();
-    if (speedType == SpeedTypes.KNOT || (entity instanceof Boat && Config.getUseKnot())) {
-      speedTypeSpeed = speed * 1.94384449;
-    }else if (speedType == SpeedTypes.KMPH) {
-      speedTypeSpeed = speed * 3.6;
-    } else if (speedType == SpeedTypes.MPH) {
-      speedTypeSpeed = speed * 2.23693629;
-    }else {
-      speedTypeSpeed = speed;
+        LOGGER.info("Finished loading speedometer");
     }
 
-    String format = String.format("%.2f", speedTypeSpeed);
-    
-    String speedString = format + " " + SpeedTypes.getName(speedType).getString();
-    
-    int width = switch ((Config.getVisualSpeedometer() && !Config.isDisableVisualSpeedometer()) ? 1 : 0){
-      case 1 -> Config.getImageSize();
-      case 0 -> Minecraft.getInstance().font.width(speedString);
-      default -> 0;
-    };
+    private static void render(GuiGraphics graphics, DeltaTracker deltaTracker) {
+        if(Minecraft.getInstance().player == null) return;
+        if(Minecraft.getInstance().options.hideGui) return;
+        Entity entity = Minecraft.getInstance().player.getRootVehicle();
 
-    int yPos = getPosImp(graphics, width, Config.getYPosition(), false);
-    int xPos = getPosImp(graphics, width, Config.getXPosition(), true);
+        Vec3 vec = new Vec3(
+                entity.getX() - entity.xOld,
+                entity.getY() - entity.yOld,
+                entity.getZ() - entity.zOld
+        );
 
-    int lineHeight = Minecraft.getInstance().font.lineHeight;
+        double yOffset = 0D;
+        double xOffset = 0D;
+        double zOffset = 0D;
+        double vOffset = 0D;
 
-    if(Config.getVisualSpeedometer() && !Config.isDisableVisualSpeedometer()){
+        double speed = (Math.sqrt(Math.pow(vec.x + xOffset, 2) + Math.pow(vec.y + yOffset, 2) + Math.pow(vec.z + zOffset, 2)) * 20)+vOffset;
+        double lSpeed = speed;
 
-      //double v = speedTypeSpeed / speedType.gatMaxVisual();
-
-      BufferedImage img = ImageHandler.scale(ICON.getSpeedometerIcon(speedTypeSpeed), Config.getImageSize(), Config.getImageSize());
-
-      for(int x1 = 0; x1 < img.getWidth(); x1++){
-        for(int y1 = 0; y1 < img.getHeight(); y1++){
-          int x2 = x1 + xPos - img.getWidth();
-          int y2 = y1 + yPos - img.getHeight();
-          
-          int rgb = img.getRGB(x1, y1);
-          
-          if(new Color(rgb).equals(Color.black)) continue;
-          
-          graphics.fill(x2, y2, x2+1, y2+1, rgb);
+        if (speeds.size() >= 30) {
+            speeds.removeFirst();
         }
-      }
-
-    }else {
-      // i -> x
-      // j -> y
-      // k -> color RGB int
-      graphics.drawString(
-          Minecraft.getInstance().font,
-          speedString,
-          xPos - width,
-          yPos - lineHeight,
-          Config.getColor().getRGB()
-      );
-    }
-
-    if(Config.isDebug()){
-      String debugData = "Velocity raw:" + "\n" +
-          "  X: " + vec.x + "\n" +
-          "  Y: " + vec.y + "\n" +
-          "  Z: " + vec.z + "\n" +
-          "Offsets:" + "\n" +
-          "  X: " + xOffset + "\n" +
-          "  Y: " + yOffset + "\n" +
-          "  Z: " + zOffset + "\n" +
-          "  Total: " + vOffset + "\n" +
-          "Velocity modified:" + "\n" +
-          "  X: " + (vec.x + xOffset) + "\n" +
-          "  Y: " + (vec.y + yOffset) + "\n" +
-          "  Z: " + (vec.z + zOffset) + "\n" +
-          "  Total: " + lSpeed + "\n" +
-          "Velocity total average: " + speed + "\n" +
-          "Velocity total in " + speedType.name() + ": " + speedTypeSpeed + "\n" +
-          "Endpoint position: (" + Debugger.x + ", " + Debugger.y + ")\n" +
-          "Percentage point of visual speedometer: " + Debugger.angle + "\n" +
-          (Config.getVisualSpeedometer()?"Visual Size: "+Config.getImageSize():"Textual display");
-
-      Color color = new Color(255, 255, 255);
-
-      int y = 0;
-      for(String s : debugData.split("\n")){
-        drawString(graphics,0, y, s, color.getRGB());
-        y+=Minecraft.getInstance().font.lineHeight+1;
-      }
-    }
-  }
-
-  private static void drawString(GuiGraphics graphics, int x, int y, String text, int colorRGB){
-    graphics.drawString(
-        Minecraft.getInstance().font,
-        text,
-        x,
-        y,
-        colorRGB
-    );
-  }
-
-  private static int getPosImp(GuiGraphics event, int width, String input, boolean isXPosition){
-    input = input.trim();
-    input = input
-            .replaceAll("(W+)|(H+)", String.valueOf(isXPosition?event.guiWidth():event.guiHeight()))
-            .replaceAll("(w+)|(h+)", String.valueOf(isXPosition?event.guiWidth()/2:event.guiHeight()/2))
-            .replaceAll("(S+)|(s+)", String.valueOf(width));
-    if((Config.isDebug()) && Config.getCounter() < 2) {
-      //String speedDisplayType = SpeedTypes.getName(Config.getSpeedType()).getString();
-      //String splitRawSpeedPosition = Arrays.toString(passerPose.toArray());
-      //String rawSpeedPosition = isXPosition ? Config.getXPosition() : Config.getYPosition();
-      LOGGER.info("Selected speed type(DEBUG): {}\n{}\n\n\n", isXPosition, input);
-      Config.addCounter();
-    }
-    return getPos(event, width, input, isXPosition);
-  }
-
-  private static int getPos(GuiGraphics event, int width, String input, boolean isXPosition) {
-    ArrayList<String> passerPose = new ArrayList<>();
-    final char[] s = input.toCharArray();
-    
-    try{
-      for(int i = 0; i <s.length; i++){
-        char c = s[i];
-        if(c == 'W' || c == 'H'){
-          if(isXPosition) passerPose.add(String.valueOf(event.guiWidth()));
-          else passerPose.add(String.valueOf(event.guiHeight()));
+        speeds.add(speed);
+        speed = 0;
+        for (Double aDouble : speeds) {
+            speed += aDouble;
         }
-        else if(c == 'h' || c == 'w'){
-          if(isXPosition) passerPose.add(String.valueOf(event.guiWidth() / 2));
-          else passerPose.add(String.valueOf(event.guiHeight() / 2));
+        speed = speed / speeds.size();
+
+        double speedTypeSpeed;
+
+        SpeedTypes speedType = Config.getSpeedType();
+        if (speedType == SpeedTypes.KNOT || (entity instanceof Boat && Config.getUseKnot())) {
+            speedTypeSpeed = speed * 1.94384449;
+        }else if (speedType == SpeedTypes.KMPH) {
+            speedTypeSpeed = speed * 3.6;
+        } else if (speedType == SpeedTypes.MPH) {
+            speedTypeSpeed = speed * 2.23693629;
+        }else {
+            speedTypeSpeed = speed;
         }
-        else if(c == 'S' || c == 's'){
-          passerPose.add(String.valueOf(width));
+
+        String format = String.format("%.2f", speedTypeSpeed);
+
+        String speedString = format + " " + SpeedTypes.getName(speedType).getString();
+
+        int width = switch ((Config.getVisualSpeedometer() && !Config.isDisableVisualSpeedometer()) ? 1 : 0){
+            case 1 -> Config.getImageSize();
+            case 0 -> Minecraft.getInstance().font.width(speedString);
+            default -> 0;
+        };
+
+        int yPos = getPosImp(graphics, width, Config.getYPosition(), false);
+        int xPos = getPosImp(graphics, width, Config.getXPosition(), true);
+
+        int lineHeight = Minecraft.getInstance().font.lineHeight;
+
+        if(Config.getVisualSpeedometer() && !Config.isDisableVisualSpeedometer()){
+
+            //double v = speedTypeSpeed / speedType.gatMaxVisual();
+
+            BufferedImage img = ImageHandler.scale(ICON.getSpeedometerIcon(speedTypeSpeed), Config.getImageSize(), Config.getImageSize());
+
+            for(int x1 = 0; x1 < img.getWidth(); x1++){
+                for(int y1 = 0; y1 < img.getHeight(); y1++){
+                    int x2 = x1 + xPos - img.getWidth();
+                    int y2 = y1 + yPos - img.getHeight();
+
+                    int rgb = img.getRGB(x1, y1);
+
+                    if(new Color(rgb).equals(Color.black)) continue;
+
+                    graphics.fill(x2, y2, x2+1, y2+1, rgb);
+                }
+            }
+
+        }else {
+            // i -> x
+            // j -> y
+            // k -> color RGB int
+            graphics.drawString(
+                    Minecraft.getInstance().font,
+                    speedString,
+                    xPos - width,
+                    yPos - lineHeight,
+                    Config.getColor().getRGB()
+            );
         }
-        else if(c == '+' ||
-                c == '-' ||
-                c == '*' ||
-                c == '/'){
-          passerPose.add(Character.toString(c));
+
+        if(Config.isDebug()){
+            String debugData = "Speedometer: "+VERSION+"\n"+
+                    "Velocity raw:" + "\n" +
+                    "  X: " + vec.x + "\n" +
+                    "  Y: " + vec.y + "\n" +
+                    "  Z: " + vec.z + "\n" +
+                    "Offsets:" + "\n" +
+                    "  X: " + xOffset + "\n" +
+                    "  Y: " + yOffset + "\n" +
+                    "  Z: " + zOffset + "\n" +
+                    "  Total: " + vOffset + "\n" +
+                    "Velocity modified:" + "\n" +
+                    "  X: " + (vec.x + xOffset) + "\n" +
+                    "  Y: " + (vec.y + yOffset) + "\n" +
+                    "  Z: " + (vec.z + zOffset) + "\n" +
+                    "  Total: " + lSpeed + "\n" +
+                    "Velocity total average: " + speed + "\n" +
+                    "Velocity total in " + speedType.name() + ": " + speedTypeSpeed + "\n" +
+                    "Endpoint position: (" + Debugger.x + ", " + Debugger.y + ")\n" +
+                    "Percentage point of visual speedometer: " + Debugger.angle + "\n" +
+                    (Config.getVisualSpeedometer()?"Visual Size: "+Config.getImageSize():"Textual display");
+
+            Color color = new Color(255, 255, 255);
+
+            int y = 0;
+            for(String s : debugData.split("\n")){
+                drawString(graphics,0, y, s, color.getRGB());
+                y+=Minecraft.getInstance().font.lineHeight+1;
+            }
         }
-        else if(Character.isDigit(c)){
-          int lastIndex = i - 1;
-          if(lastIndex > 0 && passerPose.get(lastIndex).matches("^[0-9]+$")) {
-            passerPose.add(passerPose.removeLast() + c);
-          }
-          else
-          {
-            passerPose.add(Character.toString(c));
-          }
-        }
-        else{
-          throw new Exception();
-        }
-      }
-    }catch (Exception e){
-      passerPose.clear();
-      defaultValues(event, isXPosition, passerPose);
     }
 
-    //
-
-    int position;
-    try{
-      position = Integer.parseInt(passerPose.getFirst());
-    }catch (NumberFormatException e){
-      passerPose.clear();
-      defaultValues(event, isXPosition, passerPose);
-      position = Integer.parseInt(passerPose.getFirst());
+    private static void drawString(GuiGraphics graphics, int x, int y, String text, int colorRGB){
+        graphics.drawString(
+                Minecraft.getInstance().font,
+                text,
+                x,
+                y,
+                colorRGB
+        );
     }
 
-    for(int i = 1; i < passerPose.size(); i++){
-      boolean first = false;
-      String s1 = passerPose.get(i);
-      String s2 = "";
-      try{
-        s2 = passerPose.get(i+1);
-      }catch (Exception e){
-        first = true;
-      }
+    private static int getPosImp(GuiGraphics event, int width, String input, boolean isXPosition){
+        input = input.trim();
+        input = input
+                .replaceAll("(W+)|(H+)", String.valueOf(isXPosition?event.guiWidth():event.guiHeight()))
+                .replaceAll("(w+)|(h+)", String.valueOf(isXPosition?event.guiWidth()/2:event.guiHeight()/2))
+                .replaceAll("(S+)|(s+)", String.valueOf(width));
+        if((Config.isDebug()) && Config.getCounter() < 2) {
+            //String speedDisplayType = SpeedTypes.getName(Config.getSpeedType()).getString();
+            //String splitRawSpeedPosition = Arrays.toString(passerPose.toArray());
+            //String rawSpeedPosition = isXPosition ? Config.getXPosition() : Config.getYPosition();
+            LOGGER.info("Selected speed type(DEBUG): {}\n{}\n\n\n", isXPosition, input);
+            Config.addCounter();
+        }
+        return getPos(event, width, input, isXPosition);
+    }
 
-      if(Objects.equals(s1, "+") && !first){
-        position += Integer.parseInt(s2);
-      }else if(Objects.equals(s1, "-") && !first){
-        position -= Integer.parseInt(s2);
-      }else if(Objects.equals(s1, "*") && !first){
-        position *= Integer.parseInt(s2);
-      }else if(Objects.equals(s1, "/") && !first){
-        position /= Integer.parseInt(s2);
-      }
-    }
-    if((Config.isDebug()) && Config.getCounter() < 2) {
-      String speedDisplayType = SpeedTypes.getName(Config.getSpeedType()).getString();
-      String splitRawSpeedPosition = Arrays.toString(passerPose.toArray());
-      String rawSpeedPosition = isXPosition ? Config.getXPosition() : Config.getYPosition();
-      LOGGER.info("Selected speed type: {}\n{}\n\n{}\n\n{}", speedDisplayType, splitRawSpeedPosition, position, rawSpeedPosition);
-      Config.addCounter();
-    }
-    return position;
-  }
+    private static int getPos(GuiGraphics event, int width, String input, boolean isXPosition) {
+        ArrayList<String> tokens = new ArrayList<>();
+        final char[] s = input.toCharArray();
 
-  private static void defaultValues(GuiGraphics event, boolean isXPosition, ArrayList<String> passerPose) {
-    if(isXPosition)
-    {
-      passerPose.add(String.valueOf(event.guiWidth()));
-      passerPose.add("-");
-      passerPose.add("3");
+        try{
+            for(int i = 0; i <s.length; i++){
+                char c = s[i];
+                if(c == '+' ||
+                        c == '-' ||
+                        c == '*' ||
+                        c == '/'){
+                    tokens.add(Character.toString(c));
+                }
+                else if(Character.isDigit(c)){
+                    int lastIndex = i - 1;
+                    if(lastIndex >= 0 && tokens.get(lastIndex).matches("^[0-9]+$")) {
+                        tokens.set(tokens.size() - 1, tokens.get(tokens.size() - 1) + c);
+                    }
+                    else
+                    {
+                        tokens.add(Character.toString(c));
+                    }
+                }
+                else{
+                    throw new IllegalArgumentException("Invalid character in input string: " + c);
+                }
+            }
+        }catch (Exception e){
+            tokens.clear();
+            defaultValues(event, isXPosition, tokens);
+        }
+
+        int position;
+        try{
+            position = Integer.parseInt(tokens.getFirst());
+        }catch (NumberFormatException e){
+            tokens.clear();
+            defaultValues(event, isXPosition, tokens);
+            position = Integer.parseInt(tokens.getFirst());
+        }
+
+        for(int i = 1; i < tokens.size(); i+=2){
+            String operator = tokens.get(i);
+            if(i + 1 >= tokens.size()) {
+                LOGGER.error("Invalid expression: missing operand after operator '{}'", operator);
+                break;
+            }
+            String operand = tokens.get(i + 1);
+            int value;
+            try {
+                value = Integer.parseInt(operand);
+            }
+            catch (NumberFormatException e) {
+                LOGGER.error("Invalid operand: '{}'. Using default value. REPORT THIS! https://github.com/zaze06/Speedometer/issues/new/choose", operand);
+                Minecraft.getInstance().emergencySaveAndCrash(new CrashReport("Invalid operand in speedometer position calculation. REPORT THIS! https://github.com/zaze06/Speedometer/issues/new/choose", e));
+                return -1;
+            }
+
+            switch (operator) {
+                case "+" -> position += value;
+                case "-" -> position -= value;
+                case "*" -> position *= value;
+                case "/" -> position /= value;
+            }
+        }
+
+        if (Config.isDebug() && Config.getCounter() < 2) {
+            LOGGER.info("Selected speed type: {}\n{}\n\n{}\n\n{}",
+                    SpeedTypes.getName(Config.getSpeedType()).getString(),
+                    Arrays.toString(tokens.toArray()),
+                    position,
+                    isXPosition ? Config.getXPosition() : Config.getYPosition());
+            Config.addCounter();
+        }
+
+        return position;
     }
-    else
-    {
-      passerPose.add(String.valueOf(event.guiHeight()));
-      passerPose.add("-");
-      passerPose.add("3");
+
+    private static void defaultValues(GuiGraphics event, boolean isXPosition, ArrayList<String> passerPose) {
+        if(isXPosition)
+        {
+            passerPose.add(String.valueOf(event.guiWidth()));
+            passerPose.add("-");
+            passerPose.add("3");
+        }
+        else
+        {
+            passerPose.add(String.valueOf(event.guiHeight()));
+            passerPose.add("-");
+            passerPose.add("3");
+        }
     }
-  }
 }

gradle.properties

@@ -1,29 +1,29 @@
 org.gradle.jvmargs=-Xmx8G
 
-minecraft_version=1.21.5
+minecraft_version=1.21.6
 
 archives_base_name=speedometer
-mod_version=6.3.0-no-hard-org-json
+mod_version=6.3.0
 maven_group=me.zacharias
 
 # https://modrinth.com/mod/architectury-api/versions
-architectury_version=16.0.3
+architectury_version=17.0.6
 
 # https://modrinth.com/mod/cloth-config/versions
-cloth_config_version = 18.0.145
+cloth_config_version = 19.0.147
 
 # NeoForged Only
 # https://neoforged.net/
-neoforge_version = 21.5.14-beta
+neoforge_version = 21.6.12-beta
 
 # Fabric Only
 # https://fabricmc.net/develop/
-fabric_loader_version=0.16.10
-fabric_api_version=0.119.6
+fabric_loader_version=0.16.14
+fabric_api_version=0.127.1
 
 # Fabric Only
 # https://modrinth.com/mod/modmenu/versions
-modmenu_version = 14.0.0-rc.2
+modmenu_version = 15.0.0-beta.3
 
 # Version of the org.json json library
-json_version = 20250517
+json_version = 20240303

neoforge/src/main/java/me/zacharias/speedometer/forge/SpeedometerNeoForge.java

@@ -27,7 +27,7 @@ public class SpeedometerNeoForge {
   }
 }
 
-@EventBusSubscriber(modid = MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+@EventBusSubscriber(modid = MOD_ID,/* bus = EventBusSubscriber.Bus.MOD, */value = Dist.CLIENT)
 class EventHandler
 {
   /**

neoforge/src/main/resources/updateChecker.json

@@ -8,7 +8,8 @@
     "6.2.1": "Fixed issue #3",
     "6.2.2": "Fixed issue with multi digit position in the parser",
     "6.2.3": "Fixed crash issue from 6.2.2 when playing in 1.21.4",
-    "6.2.4": "updated to 1.21.5"
+    "6.2.4": "updated to 1.21.5",
+    "6.3.0": "updated to 1.21.6, Fixed bug in tokenizer"
   },
   "promos": {
     "1.21-latest": "6.2.2",
@@ -18,6 +19,9 @@
     "1.21.4-recommended": "6.2.3",
     
     "1.21.5-latest": "6.2.4",
-    "1.21.5-recommended": "6.2.4"
+    "1.21.5-recommended": "6.2.4",
+
+    "1.21.6-latest": "6.3.0",
+    "1.21.6-recommended": "6.3.0"
   }
 }