Merge pull request #4 from RappyLabyAddons/development

RappyTV · web-flow · commit 2c11e50c36c4 · 2026-02-24T19:53:15.000+01:00
Release v1.0.2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
-          java-version: '21'
+          java-version: '25'
       - name: Cache Gradle dependencies
         uses: actions/cache@v4
         with:
diff --git a/.gitignore b/.gitignore
@@ -73,6 +73,8 @@ run/
 # LabyGradle | Addon Plugin
 build-data.txt
 .assetsroot
+resources_index.json
+access_widener_index.json
 
 # Don't ignore libraries
 !libs/*.jar
diff --git a/api/src/main/java/com/rappytv/speedruntimer/api/Timer.java b/api/src/main/java/com/rappytv/speedruntimer/api/Timer.java
@@ -1,5 +1,7 @@
-package com.rappytv.speedruntimer.util;
+package com.rappytv.speedruntimer.api;
 
+import com.rappytv.speedruntimer.api.event.CountdownCompleteEvent;
+import net.labymod.api.Laby;
 import net.labymod.api.client.component.Component;
 import net.labymod.api.client.component.format.NamedTextColor;
 import net.labymod.api.client.component.format.TextDecoration;
@@ -9,23 +11,18 @@ public class Timer {
 
     private static final String displayFormat = "%s:%s:%s";
     private static final java.util.Timer timer = new java.util.Timer();
-    private final Runnable onCountdownComplete;
     private TimerState state = TimerState.OFF;
     private TimerDirection direction = TimerDirection.COUNT_DOWN;
     private long seconds = 0;
 
-    public Timer(Runnable onCountdownComplete) {
-        this.onCountdownComplete = onCountdownComplete;
-    }
-
     public void startCountUp() {
         if(this.state != TimerState.OFF) return;
         this.direction = TimerDirection.COUNT_UP;
         this.seconds = 0;
         this.start();
     }
 
-    public void startCountDown(long seconds) {
+    public void startCountdown(long seconds) {
         if(this.state != TimerState.OFF) return;
         this.direction = TimerDirection.COUNT_DOWN;
         this.seconds = seconds;
@@ -70,7 +67,7 @@ else if(Timer.this.direction == TimerDirection.COUNT_DOWN) {
                     if(Timer.this.seconds < 0) {
                         Timer.this.seconds = 0;
                         Timer.this.state = TimerState.PAUSED;
-                        Timer.this.onCountdownComplete.run();
+                        Laby.fireEvent(new CountdownCompleteEvent());
                     }
                 }
             }
diff --git a/api/src/main/java/com/rappytv/speedruntimer/api/event/CountdownCompleteEvent.java b/api/src/main/java/com/rappytv/speedruntimer/api/event/CountdownCompleteEvent.java
@@ -0,0 +1,7 @@
+package com.rappytv.speedruntimer.api.event;
+
+import net.labymod.api.event.Event;
+
+public class CountdownCompleteEvent implements Event {
+
+}
diff --git a/api/src/main/java/com/rappytv/speedruntimer/sound/TimerSound.java b/api/src/main/java/com/rappytv/speedruntimer/sound/TimerSound.java
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 val versions = providers.gradleProperty("net.labymod.minecraft-versions").get().split(";")
 
 group = "com.rappytv.speedruntimer"
-version = providers.environmentVariable("VERSION").getOrElse("1.0.1")
+version = providers.environmentVariable("VERSION").getOrElse("1.0.2")
 
 labyMod {
     defaultPackageName = "com.rappytv.speedruntimer"
@@ -37,4 +37,9 @@ subprojects {
 
     group = rootProject.group
     version = rootProject.version
+
+    extensions.findByType(JavaPluginExtension::class.java)?.apply {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
 }
diff --git a/core/src/main/java/com/rappytv/speedruntimer/core/SpeedrunTimerAddon.java b/core/src/main/java/com/rappytv/speedruntimer/core/SpeedrunTimerAddon.java
@@ -1,17 +1,17 @@
-package com.rappytv.speedruntimer;
-
-import com.rappytv.speedruntimer.api.generated.ReferenceStorage;
-import com.rappytv.speedruntimer.command.TimerCommand;
-import com.rappytv.speedruntimer.hudwidget.TimerHudWidget;
-import com.rappytv.speedruntimer.sound.DefaultTimerSound;
-import com.rappytv.speedruntimer.sound.TimerSound;
-import com.rappytv.speedruntimer.util.Timer;
+package com.rappytv.speedruntimer.core;
+
+import com.rappytv.speedruntimer.core.command.TimerCommand;
+import com.rappytv.speedruntimer.api.event.CountdownCompleteEvent;
+import com.rappytv.speedruntimer.core.hudwidget.TimerHudWidget;
+import com.rappytv.speedruntimer.api.Timer;
 import net.labymod.api.Laby;
 import net.labymod.api.addon.LabyAddon;
 import net.labymod.api.client.component.Component;
 import net.labymod.api.client.component.format.NamedTextColor;
 import net.labymod.api.client.component.format.TextDecoration;
 import net.labymod.api.client.resources.ResourceLocation;
+import net.labymod.api.event.Subscribe;
+import net.labymod.api.loader.MinecraftVersions;
 import net.labymod.api.models.addon.annotation.AddonMain;
 import org.jetbrains.annotations.NotNull;
 
@@ -25,24 +25,29 @@ public class SpeedrunTimerAddon extends LabyAddon<SpeedrunTimerConfig> {
         .append(Component.space());
 
     private Timer timer;
+    private ResourceLocation timerSound;
 
-    @SuppressWarnings("ConstantConditions")
     @Override
-    protected void enable() {
-        TimerSound timerSound = ((ReferenceStorage) this.referenceStorageAccessor()).getTimerSound();
-        if(timerSound == null)
-            timerSound = new DefaultTimerSound();
-        ResourceLocation sound = timerSound.getNotificationSound();
-        this.timer = new Timer(() -> {
-            if(this.configuration().countdownSound().get()) {
-                Laby.references().minecraftSounds().playSound(sound, 1f, 1f);
-            }
-        });
+    public void enable() {
+        this.timer = new Timer();
+        this.initializeTimerSound();
         this.registerSettingCategory();
         this.registerCommand(new TimerCommand(this));
         Laby.labyAPI().hudWidgetRegistry().register(new TimerHudWidget(this));
     }
 
+    @Subscribe
+    public void onCountDownComplete(CountdownCompleteEvent event) {
+        if(!this.configuration().countdownSound().get() || this.timerSound == null) {
+            return;
+        }
+        Laby.references().minecraftSounds().playSound(
+            this.timerSound,
+            1f,
+            1f
+        );
+    }
+
     @Override
     protected Class<? extends SpeedrunTimerConfig> configurationClass() {
         return SpeedrunTimerConfig.class;
@@ -56,4 +61,16 @@ public Timer getTimer() {
     public static Component prefix() {
         return prefix;
     }
+
+    private void initializeTimerSound() {
+        String path;
+        if(MinecraftVersions.current().equals(MinecraftVersions.V1_8_9)) {
+            path = "note.pling";
+        } else if(MinecraftVersions.current().equals(MinecraftVersions.V1_12_2)) {
+            path = "block.note.pling";
+        } else {
+            path = "block.note_block.pling";
+        }
+        this.timerSound = ResourceLocation.create("minecraft", path);
+    }
 }
diff --git a/core/src/main/java/com/rappytv/speedruntimer/core/SpeedrunTimerConfig.java b/core/src/main/java/com/rappytv/speedruntimer/core/SpeedrunTimerConfig.java
@@ -1,4 +1,4 @@
-package com.rappytv.speedruntimer;
+package com.rappytv.speedruntimer.core;
 
 import net.labymod.api.addon.AddonConfig;
 import net.labymod.api.client.gui.screen.widget.widgets.input.SwitchWidget.SwitchSetting;
diff --git a/core/src/main/java/com/rappytv/speedruntimer/core/command/TimerCommand.java b/core/src/main/java/com/rappytv/speedruntimer/core/command/TimerCommand.java
@@ -1,9 +1,9 @@
-package com.rappytv.speedruntimer.command;
+package com.rappytv.speedruntimer.core.command;
 
-import com.rappytv.speedruntimer.SpeedrunTimerAddon;
-import com.rappytv.speedruntimer.util.Timer;
-import com.rappytv.speedruntimer.util.Timer.TimerDirection;
-import com.rappytv.speedruntimer.util.Timer.TimerState;
+import com.rappytv.speedruntimer.core.SpeedrunTimerAddon;
+import com.rappytv.speedruntimer.api.Timer;
+import com.rappytv.speedruntimer.api.Timer.TimerDirection;
+import com.rappytv.speedruntimer.api.Timer.TimerState;
 import net.labymod.api.Laby;
 import net.labymod.api.client.chat.command.Command;
 import net.labymod.api.client.chat.command.SubCommand;
@@ -134,7 +134,7 @@ public boolean execute(String prefix, String[] arguments) {
                 return true;
             }
 
-            this.timer.startCountDown(seconds);
+            this.timer.startCountdown(seconds);
             this.displayMessage(
                 Component.empty()
                     .append(SpeedrunTimerAddon.prefix())
diff --git a/core/src/main/java/com/rappytv/speedruntimer/core/hudwidget/TimerHudWidget.java b/core/src/main/java/com/rappytv/speedruntimer/core/hudwidget/TimerHudWidget.java
@@ -1,8 +1,8 @@
-package com.rappytv.speedruntimer.hudwidget;
+package com.rappytv.speedruntimer.core.hudwidget;
 
-import com.rappytv.speedruntimer.SpeedrunTimerAddon;
-import com.rappytv.speedruntimer.util.Timer.TimerState;
-import net.labymod.api.Laby;
+import com.rappytv.speedruntimer.core.SpeedrunTimerAddon;
+import com.rappytv.speedruntimer.api.Timer.TimerState;
+import net.labymod.api.client.gfx.pipeline.renderer.text.TextRenderingOptions;
 import net.labymod.api.client.gui.hud.HudWidgetRendererAccessor;
 import net.labymod.api.client.gui.hud.binding.dropzone.HudWidgetDropzone;
 import net.labymod.api.client.gui.hud.binding.dropzone.NamedHudWidgetDropzones;
@@ -12,21 +12,17 @@
 import net.labymod.api.client.gui.hud.position.HudWidgetAnchor;
 import net.labymod.api.client.gui.icon.Icon;
 import net.labymod.api.client.gui.screen.ScreenContext;
-import net.labymod.api.client.render.font.ComponentRenderer;
 import net.labymod.api.client.render.font.RenderableComponent;
-import net.labymod.api.client.render.matrix.Stack;
 import net.labymod.api.client.resources.ResourceLocation;
 import net.labymod.api.util.bounds.area.RectangleAreaPosition;
 
 public class TimerHudWidget extends SimpleHudWidget<HudWidgetConfig> {
 
     private final SpeedrunTimerAddon addon;
-    private final ComponentRenderer renderer;
 
     public TimerHudWidget(SpeedrunTimerAddon addon) {
         super("speedruntimer_display", HudWidgetConfig.class);
         this.addon = addon;
-        this.renderer = Laby.references().renderPipeline().componentRenderer();
 
         this.bindDropzones(new TimerHudWidgetDropzone());
         this.setIcon(Icon.texture(ResourceLocation.create(
@@ -45,11 +41,16 @@ public void initializePreConfigured(HudWidgetConfig config) {
 
     @Override
     public void render(RenderPhase phase, ScreenContext context, boolean isEditorContext, HudSize size) {
-        Stack stack = context.stack();
         RenderableComponent statusComponent = RenderableComponent.of(this.addon.getTimer().getDisplay());
-        if (stack != null) {
-            this.renderer.builder().text(statusComponent).pos(this.anchor.isLeft() ? 2 : (this.anchor.isCenter() ? statusComponent.getWidth() / 2.0f : 2.0f), 0).color(-1).shadow(true).centered(this.anchor.isCenter()).render(stack);
-        }
+        context.canvas().submitRenderableComponent(
+            statusComponent,
+            this.anchor.isCenter() ? statusComponent.getWidth() / 2 : 0,
+            0,
+            -1,
+            TextRenderingOptions.SHADOW | (this.anchor.isCenter()
+                ? TextRenderingOptions.CENTERED
+                : TextRenderingOptions.NONE
+            ));
         size.set(statusComponent.getWidth(), statusComponent.getHeight());
     }
 
diff --git a/core/src/main/java/com/rappytv/speedruntimer/sound/DefaultTimerSound.java b/core/src/main/java/com/rappytv/speedruntimer/sound/DefaultTimerSound.java
diff --git a/game-runner/src/v1_12_2/java/com/rappytv/speedruntimer/v1_12_2/VersionedTimerSound.java b/game-runner/src/v1_12_2/java/com/rappytv/speedruntimer/v1_12_2/VersionedTimerSound.java
diff --git a/game-runner/src/v1_8_9/java/com/rappytv/speedruntimer/v1_8_9/VersionedTimerSound.java b/game-runner/src/v1_8_9/java/com/rappytv/speedruntimer/v1_8_9/VersionedTimerSound.java
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 org.gradle.jvmargs=-Xmx4096m
-net.labymod.minecraft-versions=1.8.9;1.12.2;1.16.5;1.17.1;1.18.2;1.19.2;1.19.3;1.19.4;1.20.1;1.20.2;1.20.4;1.20.5;1.20.6;1.21;1.21.1;1.21.3;1.21.4;1.21.5
+net.labymod.minecraft-versions=1.8.9;1.12.2;1.16.5;1.17.1;1.18.2;1.19.4;1.20.1;1.20.6;1.21;1.21.1;1.21.3;1.21.4;1.21.5;1.21.8;1.21.10;1.21.11
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,7 @@
 rootProject.name = "speedruntimer"
 
 pluginManagement {
-    val labyGradlePluginVersion = "0.5.9"
+    val labyGradlePluginVersion = "0.6.0"
 
     buildscript {
         repositories {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.rappytv.speedruntimer;`
	`1`	`+package com.rappytv.speedruntimer.core;`
`2`	`2`
`3`	`3`	`import net.labymod.api.addon.AddonConfig;`
`4`	`4`	`import net.labymod.api.client.gui.screen.widget.widgets.input.SwitchWidget.SwitchSetting;`