diff --git a/build.gradle b/build.gradle index dcec043..610c37a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false } architectury { diff --git a/common/src/main/java/me/zacharias/speedometer/Client.java b/common/src/main/java/me/zacharias/speedometer/Client.java index 4f4e985..7012cda 100644 --- a/common/src/main/java/me/zacharias/speedometer/Client.java +++ b/common/src/main/java/me/zacharias/speedometer/Client.java @@ -145,8 +145,8 @@ public class Client { default -> 0; }; - int yPos = getPos(graphics, width, Config.getYPosition(), false); - int xPos = getPos(graphics, width, Config.getXPosition(), true); + int yPos = getPosImp(graphics, width, Config.getYPosition(), false); + int xPos = getPosImp(graphics, width, Config.getXPosition(), true); int lineHeight = Minecraft.getInstance().font.lineHeight; @@ -223,6 +223,22 @@ public class Client { ); } + 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 passerPose = new ArrayList<>(); final char[] s = input.toCharArray(); diff --git a/gradle.properties b/gradle.properties index d21b88b..1a1ce70 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,27 +3,27 @@ org.gradle.jvmargs=-Xmx8G minecraft_version=1.21.4 archives_base_name=speedometer -mod_version=6.2.2 +mod_version=6.2.3 maven_group=me.zacharias # https://modrinth.com/mod/architectury-api/versions -architectury_version=15.0.1 +architectury_version=15.0.3 # https://modrinth.com/mod/cloth-config/versions cloth_config_version = 17.0.144 # NeoForged Only # https://neoforged.net/ -neoforge_version = 21.4.30-beta +neoforge_version = 21.4.123 # Fabric Only # https://fabricmc.net/develop/ -fabric_loader_version=0.16.9 -fabric_api_version=0.112.1 +fabric_loader_version=0.16.10 +fabric_api_version=0.119.2 # Fabric Only # https://modrinth.com/mod/modmenu/versions -modmenu_version = 13.0.0-beta.1 +modmenu_version = 13.0.3 # Version of the org.json json library json_version = 20240303 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5667c2e..8841588 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/neoforge/src/main/java/me/zacharias/speedometer/forge/SpeedometerNeoForge.java b/neoforge/src/main/java/me/zacharias/speedometer/forge/SpeedometerNeoForge.java index 76dac13..86641bd 100644 --- a/neoforge/src/main/java/me/zacharias/speedometer/forge/SpeedometerNeoForge.java +++ b/neoforge/src/main/java/me/zacharias/speedometer/forge/SpeedometerNeoForge.java @@ -2,6 +2,7 @@ package me.zacharias.speedometer.forge; import com.mojang.datafixers.util.Unit; import me.zacharias.speedometer.Speedometer; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.packs.resources.SimplePreparableReloadListener; import net.minecraft.util.profiling.ProfilerFiller; @@ -11,10 +12,12 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.common.Mod; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; -import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent; +import net.neoforged.neoforge.client.event.AddClientReloadListenersEvent; import org.jetbrains.annotations.NotNull; -@Mod(Speedometer.MOD_ID) +import static me.zacharias.speedometer.Speedometer.MOD_ID; + +@Mod(MOD_ID) public class SpeedometerNeoForge { public SpeedometerNeoForge(IEventBus eventBus) { // Submit our event bus to let architectury register our content on the right time @@ -24,7 +27,7 @@ public class SpeedometerNeoForge { } } -@EventBusSubscriber(modid = Speedometer.MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) +@EventBusSubscriber(modid = MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) class EventHandler { /** @@ -34,8 +37,8 @@ class EventHandler * @param event The event that is fired when the client reloads resources */ @SubscribeEvent - private static void onResourceReload(RegisterClientReloadListenersEvent event) { - event.registerReloadListener(new SimplePreparableReloadListener() { + private static void onResourceReload(AddClientReloadListenersEvent event) { + event.addListener(ResourceLocation.fromNamespaceAndPath(MOD_ID, "reload_listener"), new SimplePreparableReloadListener() { @Override protected @NotNull Unit prepare(@NotNull ResourceManager arg, @NotNull ProfilerFiller arg2) { return Unit.INSTANCE;