Merge pull request #22 from RappyLabyAddons/feat/fallbackReferenceSto…

…rage

Add fallback ITbwSounds to also support future versions

.github/workflows/build.yml

@@ -7,20 +7,16 @@ on:
     branches: [ "master", "main" ]
   workflow_dispatch:
 
-env:
-  PUBLIC_RELEASE_BUILD: true
-  PUBLIC_RELEASE_BUILD_TOKEN: ${{ secrets.PUBLIC_RELEASE_BUILD_TOKEN }}
-
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '21'
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle

api/build.gradle.kts

@@ -21,6 +21,6 @@ labyModProcessor {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }

build.gradle.kts

@@ -7,8 +7,6 @@ plugins {
 group = "org.example"
 version = "1.0.0"
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
-
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
 }
@@ -20,8 +18,8 @@ labyMod {
         displayName = "Toolbreak Warning"
         author = "RappyTV"
         description = "Stops you from using your currently used tool when its almost destroyed."
-        minecraftVersion = "1.8<1.20.4"
-        version = System.getenv().getOrDefault("VERSION", "1.4.0")
+        minecraftVersion = "*"
+        version = System.getenv().getOrDefault("VERSION", "1.4.1")
     }
 
     minecraft {
@@ -36,7 +34,9 @@ labyMod {
                 "1.19.4",
                 "1.20.1",
                 "1.20.2",
-                "1.20.4"
+                "1.20.4",
+                "1.20.5",
+                "1.20.6"
         ) { version, provider ->
             configureRun(provider, version)
         }
@@ -49,7 +49,7 @@ labyMod {
     }
 
     addonDev {
-        snapshotRelease()
+        productionRelease()
     }
 }
 
@@ -77,11 +77,7 @@ fun configureRun(provider: net.labymod.gradle.core.minecraft.provider.VersionPro
         args("--addon-dev-environment", "true")
     }
 
-    provider.javaVersion = when (gameVersion) {
-        else -> {
-            JavaVersion.VERSION_17
-        }
-    }
+    provider.javaVersion = JavaVersion.VERSION_21
 
     provider.mixin {
         val mixinMinVersion = when (gameVersion) {

core/build.gradle.kts

@@ -25,6 +25,6 @@ labyModProcessor {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }

core/src/main/java/com/rappytv/toolwarn/TbwAddon.java

@@ -1,10 +1,11 @@
 package com.rappytv.toolwarn;
 
+import com.rappytv.toolwarn.api.DefaultTbwSounds;
 import com.rappytv.toolwarn.config.TbwConfiguration;
 import com.rappytv.toolwarn.core.generated.DefaultReferenceStorage;
 import com.rappytv.toolwarn.listener.ConfigMigrationListener;
 import com.rappytv.toolwarn.listener.GameTickListener;
-import com.rappytv.toolwarn.util.ITbwSounds;
+import com.rappytv.toolwarn.api.ITbwSounds;
 import net.labymod.api.Laby;
 import net.labymod.api.addon.LabyAddon;
 import net.labymod.api.client.component.Component;
@@ -15,10 +16,14 @@
 import net.labymod.api.revision.SimpleRevision;
 import net.labymod.api.util.version.SemanticVersion;
 
+@SuppressWarnings("ConstantConditions")
 @AddonMain
 public class TbwAddon extends LabyAddon<TbwConfiguration> {
 
-    public static Component prefix;
+    public static Component prefix = Component
+        .text("TBW ", Style.builder().color(NamedTextColor.RED).decorate(TextDecoration.BOLD).build())
+        .append(Component.text("» ", NamedTextColor.DARK_GRAY));
+
     private static ITbwSounds sounds;
     private static TbwAddon instance;
 
@@ -31,12 +36,11 @@ protected void preConfigurationLoad() {
 
     @Override
     protected void enable() {
-        prefix = Component
-            .text("TBW ", Style.builder().color(NamedTextColor.RED).decorate(TextDecoration.BOLD).build())
-            .append(Component.text("» ", NamedTextColor.DARK_GRAY));
-        sounds = ((DefaultReferenceStorage) this.referenceStorageAccessor()).iTbwSounds();
         registerSettingCategory();
         instance = this;
+        sounds = ((DefaultReferenceStorage) this.referenceStorageAccessor()).iTbwSounds();
+        if(sounds == null)
+            sounds = new DefaultTbwSounds();
 
         registerListener(new GameTickListener(this));
     }

game-runner/src/v1_19_2/java/com/rappytv/toolwarn/v1_19_2/TbwSoundImpl.java → core/src/main/java/com/rappytv/toolwarn/api/DefaultTbwSounds.java

@@ -1,14 +1,11 @@
-package com.rappytv.toolwarn.v1_19_2;
+package com.rappytv.toolwarn.api;
 
-import com.rappytv.toolwarn.util.ITbwSounds;
-import javax.inject.Singleton;
 import net.labymod.api.client.resources.ResourceLocation;
-import net.labymod.api.models.Implements;
 import org.jetbrains.annotations.NotNull;
+import javax.inject.Singleton;
 
 @Singleton
-@Implements(ITbwSounds.class)
-public class TbwSoundImpl implements ITbwSounds {
+public class DefaultTbwSounds implements ITbwSounds {
 
     private final ResourceLocation plingSound = ResourceLocation.create("minecraft", "block.note_block.pling");
     private final ResourceLocation levelUpSound = ResourceLocation.create("minecraft", "entity.player.levelup");

core/src/main/java/com/rappytv/toolwarn/util/ITbwSounds.java → core/src/main/java/com/rappytv/toolwarn/api/ITbwSounds.java

@@ -1,4 +1,4 @@
-package com.rappytv.toolwarn.util;
+package com.rappytv.toolwarn.api;
 
 import net.labymod.api.client.resources.ResourceLocation;
 import net.labymod.api.reference.annotation.Referenceable;

core/src/main/java/com/rappytv/toolwarn/ui/ToolConfigActivity.java

@@ -5,7 +5,6 @@
 import com.rappytv.toolwarn.util.WarnTool;
 import com.rappytv.toolwarn.util.WarnTool.Type;
 import net.labymod.api.client.gui.mouse.MutableMouse;
-import net.labymod.api.client.gui.screen.LabyScreen;
 import net.labymod.api.client.gui.screen.Parent;
 import net.labymod.api.client.gui.screen.activity.Activity;
 import net.labymod.api.client.gui.screen.activity.AutoActivity;
@@ -26,7 +25,6 @@
 import net.labymod.api.client.gui.screen.widget.widgets.layout.ScrollWidget;
 import net.labymod.api.client.gui.screen.widget.widgets.layout.list.HorizontalListWidget;
 import net.labymod.api.client.gui.screen.widget.widgets.layout.list.VerticalListWidget;
-import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -316,11 +314,6 @@ private void setAction(Action action) {
         this.reload();
     }
 
-    @Override
-    public <T extends LabyScreen> @Nullable T renew() {
-        return null;
-    }
-
     private enum Action {
         ADD, EDIT, REMOVE
     }

game-runner/src/v1_12_2/java/com/rappytv/toolwarn/v1_12_2/TbwSoundImpl.java

@@ -1,6 +1,6 @@
 package com.rappytv.toolwarn.v1_12_2;
 
-import com.rappytv.toolwarn.util.ITbwSounds;
+import com.rappytv.toolwarn.api.ITbwSounds;
 import javax.inject.Singleton;
 import net.labymod.api.client.resources.ResourceLocation;
 import net.labymod.api.models.Implements;