Merge pull request #26 from RappyLabyAddons/development

Release `v1.4.3`

Author: RappyTV

.github/workflows/build.yml

@@ -2,18 +2,18 @@ name: LabyAddon Build
 
 on:
   push:
-    branches: [ "master", "main" ]
+    branches: ["master", "main"]
   pull_request:
-    branches: [ "master", "main" ]
+    branches: ["master", "main"]
   workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
           java-version: '21'
@@ -22,7 +22,7 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build --full-stacktrace
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: build/libs/*-release.jar

api/build.gradle.kts

@@ -1,26 +1,10 @@
-version = "0.1.0"
-
-plugins {
-    id("java-library")
-}
+import net.labymod.labygradle.common.extension.LabyModAnnotationProcessorExtension.ReferenceType
 
 dependencies {
+    labyProcessor()
     labyApi("api")
-
-    // If you want to use external libraries, you can do that here.
-    // The dependencies that are specified here are loaded into your project but will also
-    // automatically be downloaded by labymod, but only if the repository is public.
-    // If it is private, you have to add and compile the dependency manually.
-    // You have to specify the repository, there are getters for maven central and sonatype, every
-    // other repository has to be specified with their url. Example:
-    // maven(mavenCentral(), "org.apache.httpcomponents:httpclient:4.5.13")
-}
-
-labyModProcessor {
-    referenceType = net.labymod.gradle.core.processor.ReferenceType.INTERFACE
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+labyModAnnotationProcessor {
+    referenceType = ReferenceType.INTERFACE
 }

core/src/main/java/com/rappytv/toolwarn/api/ITbwSounds.java api/src/main/java/com/rappytv/toolwarn/api/IToolwarnSounds.java

@@ -3,9 +3,11 @@
 import net.labymod.api.client.resources.ResourceLocation;
 import net.labymod.api.reference.annotation.Referenceable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+@Nullable
 @Referenceable
-public interface ITbwSounds {
+public interface IToolwarnSounds {
 
     @NotNull ResourceLocation getPlingSound();
     @NotNull ResourceLocation getLevelUpSound();

api/src/main/java/com/rappytv/toolwarn/api/WarnSound.java

@@ -0,0 +1,9 @@
+package com.rappytv.toolwarn.api;
+
+public enum WarnSound {
+    NONE,
+    PLING,
+    LEVEL_UP,
+    GLASS_BREAK,
+    ANVIL_USE
+}

core/src/main/java/com/rappytv/toolwarn/util/WarnTool.java api/src/main/java/com/rappytv/toolwarn/api/WarnTool.java

@@ -1,11 +1,14 @@
-package com.rappytv.toolwarn.util;
+package com.rappytv.toolwarn.api;
 
 import net.labymod.api.client.gui.icon.Icon;
 import net.labymod.api.client.resources.ResourceLocation;
 import net.labymod.api.client.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 public class WarnTool {
 
+    private static final ResourceLocation ICON_SPRITE = ResourceLocation.create("toolwarn",
+        "textures/tools.png");
     private Type type;
     private WarnSound sound;
     private WarnSound lastSound;
@@ -14,7 +17,11 @@ public class WarnTool {
     private boolean lastHitWarn;
 
     public WarnTool() {
-        this(Type.SWORD, WarnSound.NONE, WarnSound.NONE, 5, true, true);
+        this(Type.SWORD);
+    }
+
+    public WarnTool(Type type) {
+        this(type, WarnSound.NONE, WarnSound.NONE, 5, true, true);
     }
 
     public WarnTool(Type type, WarnSound sound, WarnSound lastSound, int warnAt, boolean openChat, boolean lastHitWarn) {
@@ -27,22 +34,22 @@ public WarnTool(Type type, WarnSound sound, WarnSound lastSound, int warnAt, boo
     }
 
     public Type getType() {
-        return type;
+        return this.type;
     }
     public WarnSound getSound() {
-        return sound;
+        return this.sound;
     }
     public WarnSound getLastSound() {
-        return lastSound;
+        return this.lastSound;
     }
     public int getWarnAt() {
-        return warnAt;
+        return this.warnAt;
     }
     public boolean openChat() {
-        return openChat;
+        return this.openChat;
     }
     public boolean lastHitWarn() {
-        return lastHitWarn;
+        return this.lastHitWarn;
     }
 
     public void setType(Type type) {
@@ -77,20 +84,17 @@ public enum Type {
         SHEARS(0, 2),
         TRIDENT(1, 2);
 
-        private final ResourceLocation sprite = ResourceLocation.create("toolwarn", "textures/tools.png");
-        private final int x;
-        private final int y;
+        private final Icon icon;
 
         Type(int x, int y) {
-            this.x = x;
-            this.y = y;
+            this.icon = Icon.sprite32(ICON_SPRITE, x, y);
         }
 
         public Icon getIcon() {
-            return Icon.sprite32(sprite, x, y);
+            return this.icon;
         }
 
-        public static Type getByItem(ItemStack itemStack) {
+        public static Type getByItem(@Nullable ItemStack itemStack) {
             if(itemStack == null) return NONE;
             String path = itemStack.getIdentifier().getPath();
             if (path.endsWith("_sword")) {

build.gradle.kts

@@ -1,95 +1,40 @@
 plugins {
     id("java-library")
-    id("net.labymod.gradle")
-    id("net.labymod.gradle.addon")
+    id("net.labymod.labygradle")
+    id("net.labymod.labygradle.addon")
 }
 
-group = "org.example"
-version = "1.0.0"
+val versions = providers.gradleProperty("net.labymod.minecraft-versions").get().split(";")
 
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-}
+group = "org.example"
+version = providers.environmentVariable("VERSION").getOrElse("1.4.3")
 
 labyMod {
-    defaultPackageName = "com.rappytv.toolwarn" //change this to your main package name (used by all modules)
+    defaultPackageName = "com.rappytv.toolwarn"
     addonInfo {
         namespace = "toolwarn"
         displayName = "Toolbreak Warning"
         author = "RappyTV"
         description = "Stops you from using your currently used tool when its almost destroyed."
         minecraftVersion = "*"
-        version = System.getenv().getOrDefault("VERSION", "1.4.2")
+        version = rootProject.version.toString()
     }
 
     minecraft {
-        registerVersions(
-                "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"
-        ) { version, provider ->
-            configureRun(provider, version)
-        }
-
-        subprojects.forEach {
-            if (it.name != "game-runner") {
-                filter(it.name)
+        registerVersion(versions.toTypedArray()) {
+            runs {
+                getByName("client") {
+                    devLogin = true
+                }
             }
         }
     }
-
-    addonDev {
-        productionRelease()
-    }
 }
 
 subprojects {
-    plugins.apply("java-library")
-    plugins.apply("net.labymod.gradle")
-    plugins.apply("net.labymod.gradle.addon")
-
-    repositories {
-        maven("https://libraries.minecraft.net/")
-        maven("https://repo.spongepowered.org/repository/maven-public/")
-    }
-}
+    plugins.apply("net.labymod.labygradle")
+    plugins.apply("net.labymod.labygradle.addon")
 
-fun configureRun(provider: net.labymod.gradle.core.minecraft.provider.VersionProvider, gameVersion: String) {
-    provider.runConfiguration {
-        mainClass = "net.minecraft.launchwrapper.Launch"
-        jvmArgs("-Dnet.labymod.running-version=${gameVersion}")
-        jvmArgs("-Dmixin.debug=true")
-        jvmArgs("-Dnet.labymod.debugging.all=true")
-        jvmArgs("-Dmixin.env.disableRefMap=true")
-
-        args("--tweakClass", "net.labymod.core.loader.vanilla.launchwrapper.LabyModLaunchWrapperTweaker")
-        args("--labymod-dev-environment", "true")
-        args("--addon-dev-environment", "true")
-    }
-
-    provider.javaVersion = JavaVersion.VERSION_21
-
-    provider.mixin {
-        val mixinMinVersion = when (gameVersion) {
-            "1.8.9", "1.12.2", "1.16.5" -> {
-                "0.6.6"
-            }
-
-            else -> {
-                "0.8.2"
-            }
-        }
-
-        minVersion = mixinMinVersion
-    }
+    group = rootProject.group
+    version = rootProject.version
 }

core/build.gradle.kts

@@ -1,30 +1,13 @@
-version = "0.1.0"
-
-plugins {
-    id("java-library")
-}
-
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-}
+import net.labymod.labygradle.common.extension.LabyModAnnotationProcessorExtension.ReferenceType
 
 dependencies {
+    labyProcessor()
     api(project(":api"))
 
-    // If you want to use external libraries, you can do that here.
-    // The dependencies that are specified here are loaded into your project but will also
-    // automatically be downloaded by labymod, but only if the repository is public.
-    // If it is private, you have to add and compile the dependency manually.
-    // You have to specify the repository, there are getters for maven central and sonatype, every
-    // other repository has to be specified with their url. Example:
-    // maven(mavenCentral(), "org.apache.httpcomponents:httpclient:4.5.13")
-}
-
-labyModProcessor {
-    referenceType = net.labymod.gradle.core.processor.ReferenceType.DEFAULT
+    // An example of how to add an external dependency that is used by the addon.
+    // addonMavenDependency("org.jeasy:easy-random:5.0.0")
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+labyModAnnotationProcessor {
+    referenceType = ReferenceType.DEFAULT
 }