Add initial Quilt submodule config

- Added missing `gradle.properties` for the `:quilt` module
- Added `include("quilt")` to `settings.gradle`

Not sure what this setup really does beyond setting Loom's platform to Quilt.
This doesn't currently build — possibly due to:
A) Missing support, or
B) Me doing something wrong.

This branch might be dead, but at least this stuff is tracked now.

Best regards,
my future self (if I ever come back to this)

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version /*"0.10.0.172"*/"0.10.0.243" apply false
+    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
 }
 
 architectury {
@@ -19,7 +19,7 @@ subprojects {
         // The following line declares the mojmap mappings, you may use other mappings as well
         mappings loom.officialMojangMappings()
         // The following line declares the yarn mappings you may select this one as well.
-        //mappings "net.fabricmc:yarn:1.17.1+build.65:v2"
+        // mappings "net.fabricmc:yarn:@YARN_MAPPINGS@:v2"
         //api("org.json:json:${rootProject.json_version}")
     }
 }
@@ -48,7 +48,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 16
+        options.release = 21
     }
 
     java {

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

@@ -1,21 +1,20 @@
 package me.zacharias.speedometer;
 
 import com.mojang.blaze3d.platform.InputConstants;
-import com.mojang.blaze3d.vertex.PoseStack;
 import dev.architectury.event.events.client.ClientGuiEvent;
 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.client.DeltaTracker;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.TextColor;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.vehicle.Boat;
 import net.minecraft.world.phys.Vec3;
+import net.minecraft.network.chat.Component;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
@@ -42,7 +41,7 @@ public class Client {
 
   public static void init(){
     
-    final boolean isClothLoaded = Platform.isModLoaded("cloth_config") || Platform.isModLoaded("cloth-config") || Platform.isModLoaded("cloth-config2");
+    final boolean isClothLoaded = Platform.isModLoaded("cloth_config") || Platform.isModLoaded("cloth-config");
     
     if(isClothLoaded) {
       Platform.getMod(MOD_ID).registerConfigurationScreen(parent -> ConfigMenu.getConfig(parent).build());
@@ -61,20 +60,19 @@ public class Client {
         else if(Minecraft.getInstance().player != null)
         {
             Minecraft.getInstance().player.displayClientMessage(
-                new TranslatableComponent("speedometer.error.missing_cloth")
+                Component
-                    .withStyle(style -> style.withColor(ChatFormatting.RED))
+                    .translatable("speedometer.error.missing_cloth")
-                    .append(
+                    .withColor(new Color(190, 0, 0).getRGB())
-                        new TranslatableComponent("speedometer.error.missing_cloth.open_config")
+                    .append(Component
-                            .withStyle(style -> style
+                        .translatable("speedometer.error.missing_cloth.open_config")
-                                    .withColor(ChatFormatting.DARK_RED)
+                        .withStyle(ChatFormatting.UNDERLINE)
-                                    .withUnderlined(true)
+                        .withStyle((style) -> style.withClickEvent(new ClickEvent.OpenFile(Config.getConfigPath())))
-                                    .withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, Config.getConfigPath()))))
+                    ), false);
-                , false);
+          LOGGER.warn(Component.translatable("speedometer.error.missing_cloth").getString());
-          LOGGER.warn(new TranslatableComponent("speedometer.error.missing_cloth").getString());
         }
         else
         {
-          LOGGER.warn(new TranslatableComponent("speedometer.error.missing_cloth").getString());
+          LOGGER.warn(Component.translatable("speedometer.error.missing_cloth").getString());
         }
       }
     });
@@ -94,7 +92,7 @@ public class Client {
     LOGGER.info("Finished loading speedometer");
   }
 
-  private static void render(PoseStack poseStack, float delta) {
+  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();
@@ -114,7 +112,7 @@ public class Client {
     double lSpeed = speed;
 
     if (speeds.size() >= 30) {
-      speeds.remove(0);
+      speeds.removeFirst();
     }
     speeds.add(speed);
     speed = 0;
@@ -146,8 +144,8 @@ public class Client {
       default -> 0;
     };
 
-    int yPos = getPosImp(poseStack, width, Config.getYPosition(), false);
+    int yPos = getPosImp(graphics, width, Config.getYPosition(), false);
-    int xPos = getPosImp(poseStack, width, Config.getXPosition(), true);
+    int xPos = getPosImp(graphics, width, Config.getXPosition(), true);
 
     int lineHeight = Minecraft.getInstance().font.lineHeight;
 
@@ -166,7 +164,7 @@ public class Client {
           
           if(new Color(rgb).equals(Color.black)) continue;
           
-          Gui.fill(poseStack, x2, y2, x2+1, y2+1, rgb);
+          graphics.fill(x2, y2, x2+1, y2+1, rgb);
         }
       }
 
@@ -174,11 +172,11 @@ public class Client {
       // i -> x
       // j -> y
       // k -> color RGB int
-      drawString(
+      graphics.drawString(
-              poseStack,
+          Minecraft.getInstance().font,
+          speedString,
           xPos - width,
           yPos - lineHeight,
-              speedString,
           Config.getColor().getRGB()
       );
     }
@@ -202,24 +200,20 @@ public class Client {
           "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") + "\n" +
+          (Config.getVisualSpeedometer()?"Visual Size: "+Config.getImageSize():"Textual display");
-          "Pos: ("+xPos+", "+yPos+") \n" +
-          "Width: "+Minecraft.getInstance().getWindow().getGuiScaledWidth() + "\n" +
-          "Height: "+Minecraft.getInstance().getWindow().getGuiScaledHeight();
 
       Color color = new Color(255, 255, 255);
 
       int y = 0;
       for(String s : debugData.split("\n")){
-        drawString(poseStack,0, y, s, color.getRGB());
+        drawString(graphics,0, y, s, color.getRGB());
         y+=Minecraft.getInstance().font.lineHeight+1;
       }
     }
   }
 
-  private static void drawString(PoseStack poseStack, int x, int y, String text, int colorRGB){
+  private static void drawString(GuiGraphics graphics, int x, int y, String text, int colorRGB){
-    Gui.drawString(
+    graphics.drawString(
-        poseStack,
         Minecraft.getInstance().font,
         text,
         x,
@@ -228,14 +222,11 @@ public class Client {
     );
   }
 
-  private static int getPosImp(PoseStack poseStack, int width, String input, boolean isXPosition){
+  private static int getPosImp(GuiGraphics event, int width, String input, boolean isXPosition){
-    int width1 = Minecraft.getInstance().getWindow().getGuiScaledWidth();
-    int height1 = Minecraft.getInstance().getWindow().getGuiScaledHeight();
-
     input = input.trim();
     input = input
-            .replaceAll("(W+)|(H+)", String.valueOf(isXPosition? width1 : height1))
+            .replaceAll("(W+)|(H+)", String.valueOf(isXPosition?event.guiWidth():event.guiHeight()))
-            .replaceAll("(w+)|(h+)", String.valueOf(isXPosition? width1/2 : height1/2))
+            .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();
@@ -244,14 +235,10 @@ public class Client {
       LOGGER.info("Selected speed type(DEBUG): {}\n{}\n\n\n", isXPosition, input);
       Config.addCounter();
     }
-    return getPos(poseStack, width, input, isXPosition);
+    return getPos(event, width, input, isXPosition);
   }
 
-  private static int getPos(PoseStack event, int width, String input, boolean isXPosition) {
+  private static int getPos(GuiGraphics event, int width, String input, boolean isXPosition) {
-
-    int width1 = Minecraft.getInstance().getWindow().getGuiScaledWidth();
-    int height1 = Minecraft.getInstance().getWindow().getGuiScaledHeight();
-
     ArrayList<String> passerPose = new ArrayList<>();
     final char[] s = input.toCharArray();
     
@@ -259,12 +246,12 @@ public class Client {
       for(int i = 0; i <s.length; i++){
         char c = s[i];
         if(c == 'W' || c == 'H'){
-          if(isXPosition) passerPose.add(String.valueOf(width1));
+          if(isXPosition) passerPose.add(String.valueOf(event.guiWidth()));
-          else passerPose.add(String.valueOf(height1));
+          else passerPose.add(String.valueOf(event.guiHeight()));
         }
         else if(c == 'h' || c == 'w'){
-          if(isXPosition) passerPose.add(String.valueOf(width1 / 2));
+          if(isXPosition) passerPose.add(String.valueOf(event.guiWidth() / 2));
-          else passerPose.add(String.valueOf(height1 / 2));
+          else passerPose.add(String.valueOf(event.guiHeight() / 2));
         }
         else if(c == 'S' || c == 's'){
           passerPose.add(String.valueOf(width));
@@ -277,8 +264,8 @@ public class Client {
         }
         else if(Character.isDigit(c)){
           int lastIndex = i - 1;
-          if(lastIndex >= 0 && passerPose.get(passerPose.size()-1).matches("^[0-9]+$")) {
+          if(lastIndex > 0 && passerPose.get(lastIndex).matches("^[0-9]+$")) {
-            passerPose.add(passerPose.remove(passerPose.size()-1) + c);
+            passerPose.add(passerPose.removeLast() + c);
           }
           else
           {
@@ -298,11 +285,11 @@ public class Client {
 
     int position;
     try{
-      position = Integer.parseInt(passerPose.get(0));
+      position = Integer.parseInt(passerPose.getFirst());
     }catch (NumberFormatException e){
       passerPose.clear();
       defaultValues(event, isXPosition, passerPose);
-      position = Integer.parseInt(passerPose.get(0));
+      position = Integer.parseInt(passerPose.getFirst());
     }
 
     for(int i = 1; i < passerPose.size(); i++){
@@ -335,16 +322,16 @@ public class Client {
     return position;
   }
 
-  private static void defaultValues(PoseStack event, boolean isXPosition, ArrayList<String> passerPose) {
+  private static void defaultValues(GuiGraphics event, boolean isXPosition, ArrayList<String> passerPose) {
     if(isXPosition)
     {
-      passerPose.add(String.valueOf(Minecraft.getInstance().getWindow().getGuiScaledWidth()));
+      passerPose.add(String.valueOf(event.guiWidth()));
       passerPose.add("-");
       passerPose.add("3");
     }
     else
     {
-      passerPose.add(String.valueOf(Minecraft.getInstance().getWindow().getGuiScaledHeight()));
+      passerPose.add(String.valueOf(event.guiHeight()));
       passerPose.add("-");
       passerPose.add("3");
     }

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

@@ -2,7 +2,7 @@ package me.zacharias.speedometer;
 
 import me.shedaniel.clothconfig2.api.*;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 
 import java.util.Optional;
 
@@ -10,34 +10,33 @@ public class ConfigMenu {
   public static ConfigBuilder getConfig(Screen parent) {
     ConfigBuilder builder = ConfigBuilder.create()
         .setParentScreen(parent)
-        .setTitle(new TranslatableComponent("speedometer.config.name"));
+        .setTitle(Component.translatable("speedometer.config.name"));
 
-    ConfigCategory category = builder.getOrCreateCategory(new TranslatableComponent("speedometer.config.category.name"));
+    ConfigCategory category = builder.getOrCreateCategory(Component.translatable("speedometer.config.category.name"));
 
     ConfigEntryBuilder entryBuilder = builder.entryBuilder();
 
-    category.addEntry(entryBuilder.startEnumSelector(new TranslatableComponent("speedometer.config.speed"), SpeedTypes.class, me.zacharias.speedometer.Config.getSpeedType())
+    category.addEntry(entryBuilder.startEnumSelector(Component.translatable("speedometer.config.speed"), SpeedTypes.class, me.zacharias.speedometer.Config.getSpeedType())
         .setEnumNameProvider(SpeedTypes::getName)
         .setSaveConsumer(me.zacharias.speedometer.Config::setSpeedType)
-                    //.setDefaultValue(SpeedTypes.BlockPS)
         .build()
     );
 
-    category.addEntry(entryBuilder.startColorField(new TranslatableComponent("speedometer.config.color"), me.zacharias.speedometer.Config.getColorRGB())
+    category.addEntry(entryBuilder.startColorField(Component.translatable("speedometer.config.color"), me.zacharias.speedometer.Config.getColorRGB())
         .setSaveConsumer2(color -> Config.setColor(color.getRed(), color.getGreen(), color.getBlue()))
         .build()
     );
 
-    category.addEntry(entryBuilder.startBooleanToggle(new TranslatableComponent("speedometer.config.knot"), me.zacharias.speedometer.Config.getUseKnot())
+    category.addEntry(entryBuilder.startBooleanToggle(Component.translatable("speedometer.config.knot"), me.zacharias.speedometer.Config.getUseKnot())
         .setSaveConsumer(me.zacharias.speedometer.Config::setUseKnot)
-        .setYesNoTextSupplier(useKnot -> new TranslatableComponent("speedometer.useKnot."+useKnot))
+        .setYesNoTextSupplier(useKnot -> Component.translatable("speedometer.useKnot."+useKnot))
         .build()
     );
 
-    category.addEntry(entryBuilder.startBooleanToggle(new TranslatableComponent("speedometer.config.visualSpeedometer"), me.zacharias.speedometer.Config.getVisualSpeedometer())
+    category.addEntry(entryBuilder.startBooleanToggle(Component.translatable("speedometer.config.visualSpeedometer"), me.zacharias.speedometer.Config.getVisualSpeedometer())
         .setSaveConsumer(me.zacharias.speedometer.Config::setVisualSpeedometer)
-        .setYesNoTextSupplier((visualSpeedometer -> new TranslatableComponent("speedometer.visualSpeedometer."+visualSpeedometer)))
+        .setYesNoTextSupplier((visualSpeedometer -> Component.translatable("speedometer.visualSpeedometer."+visualSpeedometer)))
-        //.setRequirement(Requirement.isFalse(Config::isDisableVisualSpeedometer))
+        .setRequirement(Requirement.isFalse(Config::isDisableVisualSpeedometer))
         .build()
     );
 
@@ -46,50 +45,50 @@ public class ConfigMenu {
     String xRegex = "W*w*S*s*\\+*-*\\**/*[0-9]*";
     String yRegex = "H*h*S*s*\\+*-*\\**/*[0-9]*";
 
-    category.addEntry(entryBuilder.startStringDropdownMenu(new TranslatableComponent("speedometer.config.xPosition"), Config.getXPosition())
+    category.addEntry(entryBuilder.startStringDropdownMenu(Component.translatable("speedometer.config.xPosition"), Config.getXPosition())
         .setSaveConsumer(Config::setXPosition)
         .setErrorSupplier(xPosition -> {
           if(xPosition.matches(xRegex)){
             return Optional.empty();
           }else{
-            return Optional.of(new TranslatableComponent("speedometer.invalid"));
+            return Optional.of(Component.translatable("speedometer.invalid"));
           }
         })
         .setTooltip(
-            new TranslatableComponent("speedometer.config.tooltip.xPosition.line1"),
+            Component.translatable("speedometer.config.tooltip.xPosition.line1"),
-            new TranslatableComponent("speedometer.config.tooltip.xPosition.line2"),
+            Component.translatable("speedometer.config.tooltip.xPosition.line2"),
-            new TranslatableComponent("speedometer.config.tooltip.xPosition.line3")
+            Component.translatable("speedometer.config.tooltip.xPosition.line3")
         )
         .build()
     );
 
 
-    category.addEntry(entryBuilder.startStringDropdownMenu(new TranslatableComponent("speedometer.config.yPosition"), Config.getYPosition())
+    category.addEntry(entryBuilder.startStringDropdownMenu(Component.translatable("speedometer.config.yPosition"), Config.getYPosition())
         .setSaveConsumer(Config::setYPosition)
         .setErrorSupplier(yPosition -> {
           if(yPosition.matches(yRegex)){
             return Optional.empty();
           }else{
-            return Optional.of(new TranslatableComponent("speedometer.invalid"));
+            return Optional.of(Component.translatable("speedometer.invalid"));
           }
         })
         .setTooltip(
-            new TranslatableComponent("speedometer.config.tooltip.yPosition.line1"),
+            Component.translatable("speedometer.config.tooltip.yPosition.line1"),
-            new TranslatableComponent("speedometer.config.tooltip.yPosition.line2"),
+            Component.translatable("speedometer.config.tooltip.yPosition.line2"),
-            new TranslatableComponent("speedometer.config.tooltip.yPosition.line3")
+            Component.translatable("speedometer.config.tooltip.yPosition.line3")
         )
         .build()
     );
 
     // Size of visual image
 
-    category.addEntry(entryBuilder.startIntField(new TranslatableComponent("speedometer.config.imageSize"), Config.getImageSize())
+    category.addEntry(entryBuilder.startIntField(Component.translatable("speedometer.config.imageSize"), Config.getImageSize())
         .setSaveConsumer(Config::setImageSize)
-        .setTooltip(new TranslatableComponent("speedometer.config.tooltip.imageSize"))
+        .setTooltip(Component.translatable("speedometer.config.tooltip.imageSize"))
         .setErrorSupplier(size -> {
             if(size > 300 || size < 10)
             {
-                return Optional.of(new TranslatableComponent("speedometer.config.error.size_outofbounds"));
+                return Optional.of(Component.translatable("speedometer.config.error.size_outofbounds"));
             }
             else {
                 return Optional.empty();
@@ -100,26 +99,26 @@ public class ConfigMenu {
 
     // Show visual speed type
 
-    category.addEntry(entryBuilder.startBooleanToggle(new TranslatableComponent("speedometer.config.showSpeedType"), Config.getShowSpeedType())
+    category.addEntry(entryBuilder.startBooleanToggle(Component.translatable("speedometer.config.showSpeedType"), Config.getShowSpeedType())
         .setSaveConsumer(Config::setShowSpeedType)
-        .setYesNoTextSupplier(showSpeedType -> new TranslatableComponent("speedometer."+(showSpeedType?"show":"hide")))
+        .setYesNoTextSupplier(showSpeedType -> Component.translatable("speedometer."+(showSpeedType?"show":"hide")))
-        .setTooltip(new TranslatableComponent("speedometer.config.tooltip.showSpeedType.line1"))
+        .setTooltip(Component.translatable("speedometer.config.tooltip.showSpeedType.line1"))
         .build()
     );
 
-    category.addEntry(entryBuilder.startBooleanToggle(new TranslatableComponent("speedometer.config.override_color"), Config.isOverrideColor())
+    category.addEntry(entryBuilder.startBooleanToggle(Component.translatable("speedometer.config.override_color"), Config.isOverrideColor())
         .setSaveConsumer(Config::setOverrideColor)
         .setTooltip(
-                new TranslatableComponent("speedometer.config.tooltip.override_color.line1"),
+                Component.translatable("speedometer.config.tooltip.override_color.line1"),
-                new TranslatableComponent("speedometer.config.tooltip.override_color.line2")
+                Component.translatable("speedometer.config.tooltip.override_color.line2")
         )
         .build()
     );
 
-    category.addEntry(entryBuilder.startBooleanToggle(new TranslatableComponent("speedometer.config.debug"),Config.isDebug())
+    category.addEntry(entryBuilder.startBooleanToggle(Component.translatable("speedometer.config.debug"),Config.isDebug())
         .setSaveConsumer(Config::setDebug)
-        .setYesNoTextSupplier(isDebug -> new TranslatableComponent("speedometer.debug."+isDebug))
+        .setYesNoTextSupplier(isDebug -> Component.translatable("speedometer.debug."+isDebug))
-        .setTooltip(new TranslatableComponent("speedometer.config.tooltip.debug"))
+        .setTooltip(Component.translatable("speedometer.config.tooltip.debug"))
         .build()
     );
 

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

@@ -1,7 +1,6 @@
 package me.zacharias.speedometer;
 
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 
 public enum SpeedTypes {
   MPH,
@@ -12,7 +11,7 @@ public enum SpeedTypes {
 
   public static Component getName(Enum anEnum) {
     if(anEnum instanceof SpeedTypes speedType) {
-      return new TranslatableComponent("speedometer.speed." + switch (speedType) {
+      return Component.translatable("speedometer.speed." + switch (speedType) {
         case MPH -> "mph";
         case MPS -> "mps";
         case KMPH -> "kmph";
@@ -20,7 +19,7 @@ public enum SpeedTypes {
         case KNOT -> "knot";
       });
     }else {
-      return new TranslatableComponent("speedometer.speed.error");
+      return Component.translatable("speedometer.speed.error");
     }
   }
 }

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

@@ -12,8 +12,6 @@ import org.json.JSONObject;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -53,9 +51,10 @@ public class Speedometer
     Client.init();
   }
   
-  public static void loadSpeedometers(ResourceManager resourceManager) throws IOException {
+  public static void loadSpeedometers(ResourceManager resourceManager)
+  {
     //List< Resource > resource = Minecraft.getInstance().getResourceManager().getResourceStack(ResourceLocation.fromNamespaceAndPath(MOD_ID, "models/speedometer.json"));
-    Optional<Resource> resource = Optional.of(resourceManager.getResource(new ResourceLocation(MOD_ID, "models/speedometer.json")));
+    Optional< Resource > resource = resourceManager.getResource(ResourceLocation.fromNamespaceAndPath(MOD_ID, "models/speedometer.json"));
 
     if(resource.isEmpty())
     {
@@ -64,7 +63,7 @@ public class Speedometer
       return;
     }
     
-    try(BufferedReader stream = new BufferedReader(new InputStreamReader(resource.get().getInputStream()))/*.openAsReader()*/) {
+    try(BufferedReader stream = resource.get().openAsReader()) {
       String tmp;
       StringBuilder builder = new StringBuilder();
       while ((tmp = stream.readLine()) != null) {
@@ -73,7 +72,7 @@ public class Speedometer
       JSONObject data = new JSONObject(builder.toString());
       if(Config.isDebug())
       {
-        LOGGER.info("Loaded speedometer from {}, with speedometer name: {}", resource.get().getSourceName(), data.get("name"));
+        LOGGER.info("Loaded speedometer from {}, with speedometer name: {}", resource.get().source().packId(), data.get("name"));
       }
       ICON = new SpeedometerIcon(data, resourceManager);
     }
@@ -83,7 +82,7 @@ public class Speedometer
       return;
     }
     
-    LOGGER.info("Successfully loaded speedometer config from {}", resource.get().getSourceName());
+    LOGGER.info("Successfully loaded speedometer config from {}", resource.get().source().packId());
   }
 
   public static String formatMillisToDHMS(long millis) {

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

@@ -1,11 +1,9 @@
 package me.zacharias.speedometer;
 
-import com.mojang.brigadier.StringReader;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-//import org.joml.Vector2i;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.Resource;
 import net.minecraft.server.packs.resources.ResourceManager;
+import org.joml.Vector2i;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -27,7 +25,8 @@ public class SpeedometerIcon {
     private boolean overflow;
     private boolean g = false;
     
-    public SpeedometerIcon(JSONObject config, ResourceManager resourceManager) throws MissingPropertyException, IOException, JSONException, CommandSyntaxException {
+    public SpeedometerIcon(JSONObject config, ResourceManager resourceManager) throws MissingPropertyException, IOException, JSONException
+    {
         if(!config.has("background")) throw new MissingPropertyException("background");
         
         String background = config.getString("background");
@@ -41,10 +40,10 @@ public class SpeedometerIcon {
             background = "textures/"+background;
         }
         
-        Optional<Resource> speedometerIcon = Optional.of(resourceManager.getResource(ResourceLocation.read(new StringReader(background))));//.getOrThrow(s -> new MissingPropertyException("background")));
+        Optional<Resource> speedometerIcon = resourceManager.getResource(ResourceLocation.read(background).getOrThrow(s -> new MissingPropertyException("background")));
         if(speedometerIcon.isEmpty()) throw new MissingPropertyException("background");
         
-        InputStream stream = speedometerIcon.get().getInputStream();
+        InputStream stream = speedometerIcon.get().open();
         this.speedometerIcon = ImageIO.read(stream);
         stream.close();
         
@@ -84,7 +83,8 @@ class Pointer
     private int length;
     private boolean g = false;
     
-    public Pointer(JSONObject pointer, ResourceManager resourceManager, Vector2i size) throws MissingPropertyException, IOException, JSONException, CommandSyntaxException {
+    public Pointer(JSONObject pointer, ResourceManager resourceManager, Vector2i size) throws MissingPropertyException, IOException, JSONException
+    {
         if(!pointer.has("start")) throw new MissingPropertyException("pointer/start");
         if(pointer.get("start") instanceof JSONObject jsonObject)
         {
@@ -122,10 +122,10 @@ class Pointer
                 imageResourceLocation = "textures/"+imageResourceLocation;
             }
             
-            Optional<Resource> image = Optional.of(resourceManager.getResource(ResourceLocation.read(new StringReader(imageResourceLocation))));//.getOrThrow(s -> new MissingPropertyException("pointer/image")));
+            Optional<Resource> image = resourceManager.getResource(ResourceLocation.read(imageResourceLocation).getOrThrow(s -> new MissingPropertyException("pointer/image")));
             if(image.isEmpty()) throw new MissingPropertyException("pointer/image");
             
-            InputStream stream = image.get().getInputStream();//.open();
+            InputStream stream = image.get().open();
             this.image = ImageHandler.scale(ImageIO.read(stream), size.x, size.y);
             stream.close();
         }

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

@@ -1,17 +0,0 @@
-package me.zacharias.speedometer;
-
-public class Vector2i {
-    int x, y;
-    public Vector2i(int x, int y) {
-        this.x = x;
-        this.y = y;
-    }
-
-    public int getX() {
-        return x;
-    }
-
-    public int getY() {
-        return y;
-    }
-}

fabric/build.gradle

@@ -23,13 +23,13 @@ repositories {
 
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}+1.17"
+    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}+${rootProject.minecraft_version}"
     // Remove the next line if you don't want to depend on the API
     modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
 
     modApi "me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_config_version}"
     modApi "com.terraformersmc:modmenu:${rootProject.modmenu_version}"
-    //modApi "eu.pb4:placeholder-api:2.4.0-pre.2+1.21"
+    modApi "eu.pb4:placeholder-api:2.4.0-pre.2+1.21"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
@@ -49,7 +49,7 @@ shadowJar {
 }
 
 remapJar {
-    input/*File*/.set shadowJar.archiveFile
+    inputFile.set shadowJar.archiveFile
     dependsOn shadowJar
     archiveClassifier.set(null)
 }

fabric/src/main/java/me/zacharias/speedometer/fabric/SpeedometerFabric.java

@@ -8,8 +8,6 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.resources.ResourceManager;
 
-import java.io.IOException;
-
 public class SpeedometerFabric implements ModInitializer {
   @Override
   public void onInitialize() {
@@ -26,16 +24,12 @@ public class SpeedometerFabric implements ModInitializer {
        */
       @Override
       public void onResourceManagerReload(ResourceManager resourceManager) {
-          try {
         Speedometer.loadSpeedometers(resourceManager);
-          } catch (IOException e) {
-              throw new RuntimeException(e);
-          }
       }
       
       @Override
       public ResourceLocation getFabricId() {
-        return new ResourceLocation("speedometer", "visual_speedometer_reload_listener");
+        return ResourceLocation.fromNamespaceAndPath("speedometer", "visual_speedometer_reload_listener");
       }
     });
   }

fabric/src/main/resources/fabric.mod.json

@@ -19,11 +19,11 @@
     "main": ["me.zacharias.speedometer.fabric.SpeedometerFabric"]
   },
   "depends": {
-    "fabricloader": ">=0.12.12",
+    "fabricloader": ">=0.15.11",
-    "minecraft": ">=1.17 <1.19",
+    "minecraft": ">=1.21",
-    "architectury": ">=2.10.10"
+    "architectury": ">=13.0.5"
   },
   "suggests": {
-    "cloth-config1": ">=5.3.63"
+    "cloth-config1": ">=15.0.140"
   }
 }

forge/build.gradle

@@ -1,100 +0,0 @@
-plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
-}
-architectury {
-    platformSetupLoomIde()
-    forge()
-}
-
-repositories{
-    maven { url "https://maven.shedaniel.me/" }
-}
-
-configurations {
-    /*common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentForge.extendsFrom common*/
-    common {
-        canBeResolved = true
-        canBeConsumed = false
-    }
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentForge.extendsFrom common
-
-    // Files in this configuration will be bundled into your mod using the Shadow plugin.
-    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
-    shadowBundle {
-        canBeResolved = true
-        canBeConsumed = false
-    }
-}
-
-dependencies {
-    forge "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    // Remove the next line if you don't want to depend on the API
-    modApi "dev.architectury:architectury-forge:${architectury_version}"
-
-    modApi "me.shedaniel.cloth:cloth-config-forge:${cloth_config_version}"
-
-    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
-    shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
-
-    //implementation 'org.json:json:20230227'
-    //include 'org.json:json:20230227'
-    //forgeRuntimeLibrary 'org.json:json:20230227'
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    exclude "fabric.mod.json"
-
-
-    configurations = [project.configurations.shadowBundle]
-    archiveClassifier = 'dev-shadow'
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-    archiveClassifier.set(null)
-}
-
-jar {
-    archiveClassifier.set("dev")
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-publishing {
-    publications {
-        mavenForge(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}

forge/gradle.properties

@@ -1 +0,0 @@
-loom.platform=forge

forge/src/main/java/me/zacharias/speedometer/forge/SpeedometerForge.java

@@ -1,51 +0,0 @@
-package me.zacharias.speedometer.forge;
-
-import com.mojang.datafixers.util.Unit;
-import dev.architectury.platform.forge.EventBuses;
-import me.zacharias.speedometer.Speedometer;
-import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.server.packs.resources.SimplePreparableReloadListener;
-import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RegisterClientReloadListenersEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-
-import static me.zacharias.speedometer.Speedometer.MOD_ID;
-
-@Mod(MOD_ID)
-public class SpeedometerForge {
-    public SpeedometerForge() {
-		// Submit our event bus to let architectury register our content on the right time
-        EventBuses.registerModEventBus(MOD_ID, FMLJavaModLoadingContext.get().getModEventBus());
-        Speedometer.init();
-    }
-}
-
-@Mod.EventBusSubscriber(modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
-class EventHandler
-{
-    @SubscribeEvent
-    public static void onResourceReload(RegisterClientReloadListenersEvent event)
-    {
-        event.registerReloadListener(new SimplePreparableReloadListener<Unit>() {
-            @Override
-            protected @NotNull Unit prepare(@NotNull ResourceManager arg, @NotNull ProfilerFiller arg2) {
-                return Unit.INSTANCE;
-            }
-
-            @Override
-            protected void apply(@NotNull Unit object, @NotNull ResourceManager resourceManager, @NotNull ProfilerFiller arg2) {
-                try {
-                    Speedometer.loadSpeedometers(resourceManager);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        });
-    }
-}

forge/src/main/resources/META-INF/mods.toml

@@ -1,79 +0,0 @@
-# This is an example mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[37,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
-# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
-license="All Rights Reserved"
-# A URL to refer people to when problems occur with this mod
-issueTrackerURL="https://github.com/zaze06/speedometer/issues"
-# A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
-# The modid of the mod
-modId="speedometer" #mandatory
-# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-# ${version} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
-# see the associated build.gradle script for how to populate this completely automatically during a build
-version="${version}" #mandatory
-# A display name for the mod
-displayName="speedometer" #mandatory
-# A URL to query for updates for this mod. See the JSON update specification <here>
-#updateJSONURL="http://myurl.me/" #optional
-# A URL for the "homepage" for this mod, displayed in the mod UI
-#displayURL="http://example.com/" #optional
-# A file name (in the root of the mod JAR) containing a logo for display
-logoFile="icon.png" #optional
-# A text field displayed in the mod UI
-#credits="Thanks for this example mod goes to Java" #optional
-# A text field displayed in the mod UI
-authors="Zacharias" #optional
-# Display Test controls the display for your mod in the server connection screen
-# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod.
-# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod.
-# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
-# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
-# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
-#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
-
-# The description text for the mod (multi line!) (#mandatory)
-description='''
-just displaying your speed
-'''
-# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
-[[dependencies.speedometer]] #optional
-    # the modid of the dependency
-    modId="forge" #mandatory
-    # Does this dependency have to exist - if not, ordering below must be specified
-    mandatory=true #mandatory
-    # The version range of the dependency
-    versionRange="[37,)" #mandatory
-    # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
-    ordering="NONE"
-    # Side this dependency is applied on - BOTH, CLIENT or SERVER
-    side="BOTH"
-# Here's another dependency
-[[dependencies.speedometer]]
-    modId="minecraft"
-    mandatory=true
-    # This version range declares a minimum of the current minecraft version up to but not including the next major version
-    versionRange="[1.17,1.19)"
-    ordering="NONE"
-    side="BOTH"
-[[dependencies.speedometer]]
-    modId="architectury"
-    mandatory=true
-    versionRange="[2.10.10,)"
-    ordering="BEFORE"
-    side="CLIENT"
-[[dependencies.speedometer]]
-    modId="cloth_config"
-    mandatory=false
-    type="optional"
-    versionRange="[5.3.63,)"
-    ordering="BEFORE"
-    side="CLIENT"

forge/src/main/resources/pack.mcmeta

@@ -1,6 +0,0 @@
-{
-  "pack": {
-    "description": "speedometer resources",
-    "pack_format": 7
-  }
-}

forge/src/main/resources/updateChecker.json

@@ -1,5 +1,8 @@
 {
   "homepage": "https://modrinth.com/mod/speedometer/versions",
+  "1.17.1": {
+    "6.2.4": "Backport by request from issue #3"
+  },
   "1.20.6": {
     "1.0": "First version",
     "2.0": "Made the speedometer text movable, added debug data display, added visual speedometer",
@@ -104,6 +107,9 @@
     "1.20.1-recommended": "5.2",
     
     "1.20-latest": "5.2",
-    "1.20-recommended": "5.2"
+    "1.20-recommended": "5.2",
+
+    "1.17.1-latest": "6.2.4",
+    "1.17.1-recommended": "6.2.4"
   }
 }

gradle.properties

@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx8G
 
-minecraft_version=1.17.1
+minecraft_version=1.21.5
 
 archives_base_name=speedometer
-mod_version=6.2.4-1.17.1
+mod_version=6.2.4
 maven_group=me.zacharias
 
 # https://modrinth.com/mod/architectury-api/versions
-architectury_version = 2.10.12
+architectury_version=16.0.3
 
 # https://modrinth.com/mod/cloth-config/versions
-cloth_config_version = 5.3.63
+cloth_config_version = 18.0.145
 
 # NeoForged Only
 # https://neoforged.net/
@@ -18,14 +18,12 @@ neoforge_version = 21.5.14-beta
 
 # Fabric Only
 # https://fabricmc.net/develop/
-fabric_loader_version = 0.13.2
+fabric_loader_version=0.16.10
-fabric_api_version = 0.45.0
+fabric_api_version=0.119.6
+
+# Fabric Only
 # https://modrinth.com/mod/modmenu/versions
-modmenu_version = 2.0.17
+modmenu_version = 14.0.0-rc.2
-
-# Forge Only
-
-forge_version = 37.1.1
 
 # Version of the org.json json library
 json_version = 20240303

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Jun 21 10:45:53 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

neoforge/src/main/resources/updateChecker.json

@@ -5,10 +5,19 @@
     "6.0.1": "Small bug fix in Parser",
     "6.1": "Small bug fix in Parser",
     "6.2": "Making speedometer and pointer resource pack based",
-    "6.2.1": "Fixed issue #3"
+    "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"
   },
   "promos": {
-    "1.21-latest": "6.2.1",
+    "1.21-latest": "6.2.2",
-    "1.21-recommended": "6.2.1"
+    "1.21-recommended": "6.2.2",
+    
+    "1.21.4-latest": "6.2.3",
+    "1.21.4-recommended": "6.2.3",
+    
+    "1.21.5-latest": "6.2.4",
+    "1.21.5-recommended": "6.2.4"
   }
 }

quilt/gradle.properties

@@ -0,0 +1 @@
+loom.platform=quilt

settings.gradle

@@ -9,5 +9,5 @@ pluginManagement {
 
 include("common")
 include("fabric")
-include("forge")
+include("neoforge")
-//include("neoforge")
+include("quilt")