Merge pull request #32 from RappyLabyAddons/development

Release `v1.1.1`

Author: RappyTV

.github/workflows/accent.yml

@@ -2,27 +2,41 @@ name: LabyAddon Build
 
 on:
   push:
-    branches: [ "master", "main" ]
+    branches: [ "master" ]
   pull_request:
-    branches: [ "master", "main" ]
+    branches: [ "master" ]
   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'
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.gradle/caches
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+              gradle-${{ runner.os }}-
+      - name: Cache Gradle wrapper
+        uses: actions/cache@v4
+        with:
+          path: ~/.gradle/wrapper
+          key: gradle-wrapper-${{ runner.os }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+          restore-keys: |
+              gradle-wrapper-${{ runner.os }}-
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - 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

.github/workflows/build.yml

@@ -0,0 +1,40 @@
+package com.rappytv.deathfinder.api.event;
+
+import com.rappytv.deathfinder.api.util.DeathLocation;
+import net.labymod.addons.waypoints.Waypoints;
+import net.labymod.api.Laby;
+import net.labymod.api.client.entity.player.ClientPlayer;
+import net.labymod.api.event.Event;
+import org.jetbrains.annotations.NotNull;
+import java.util.Objects;
+
+public class DeathEvent implements Event {
+
+    private final DeathLocation location;
+    private final boolean hardcore;
+
+    public DeathEvent(boolean hardcore) {
+        this.hardcore = hardcore;
+        ClientPlayer player = Laby.labyAPI().minecraft().getClientPlayer();
+        if(player == null) throw new NullPointerException("Player cannot be null");
+
+        this.location = new DeathLocation(
+            player.position(),
+            player.getRotationYaw(),
+            player.getRotationPitch(),
+            Objects.requireNonNullElse(
+                Waypoints.references().waypointService().getDimension(),
+                "labymod:unknown"
+            )
+        );
+    }
+
+    @NotNull
+    public DeathLocation location() {
+        return this.location;
+    }
+
+    public boolean isHardcore() {
+        return this.hardcore;
+    }
+}

accent.json

@@ -0,0 +1,80 @@
+package com.rappytv.deathfinder.api.util;
+
+import net.labymod.api.util.math.position.Position;
+import net.labymod.api.util.math.vector.DoubleVector3;
+import org.jetbrains.annotations.NotNull;
+import java.util.Objects;
+
+@SuppressWarnings("unused")
+public class DeathLocation {
+
+    private final double x;
+    private final double y;
+    private final double z;
+    private final float yaw;
+    private final float pitch;
+    private final String dimension;
+    private final long diedAt;
+
+    public DeathLocation(double x, double y, double z, @NotNull String dimension) {
+        this(x, y, z, 0f, 0f, dimension);
+    }
+
+    public DeathLocation(@NotNull Position position, float yaw, float pitch, @NotNull String dimension) {
+        this(position.getX(), position.getY(), position.getZ(), yaw, pitch, dimension);
+    }
+
+    public DeathLocation(double x, double y, double z, float yaw, float pitch, @NotNull String dimension) {
+        Objects.requireNonNull(dimension, "Dimension cannot be null");
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.yaw = yaw;
+        this.pitch = pitch;
+        this.dimension = dimension;
+        this.diedAt = System.currentTimeMillis();
+    }
+
+    public double getX() {
+        return this.x;
+    }
+
+    public double getY() {
+        return this.y;
+    }
+
+    public double getZ() {
+        return this.z;
+    }
+
+    public double getYaw() {
+        return this.yaw;
+    }
+
+    public double getPitch() {
+        return this.pitch;
+    }
+
+    @NotNull
+    public String getDimension() {
+        return this.dimension;
+    }
+
+    public long getTimestamp() {
+        return this.diedAt;
+    }
+
+    public DoubleVector3 toDoubleVector3() {
+        return new DoubleVector3(this.x, this.y, this.z);
+    }
+
+    public boolean equals(DeathLocation location) {
+        if(location == null) return false;
+        return this.x == location.x
+            && this.y == location.y
+            && this.z == location.z
+            && this.pitch == location.pitch
+            && this.yaw == location.yaw
+            && this.dimension.equals(location.dimension);
+    }
+}

api/src/main/java/com/rappytv/deathfinder/api/event/DeathEvent.java

@@ -0,0 +1,19 @@
+package com.rappytv.deathfinder.api.util;
+
+import net.labymod.api.reference.annotation.Referenceable;
+
+@Referenceable
+public abstract class DeathManager {
+
+    private DeathLocation location;
+
+    public abstract void respawn();
+
+    public DeathLocation getLocation() {
+        return this.location;
+    }
+
+    public void setLocation(DeathLocation location) {
+        this.location = location;
+    }
+}

api/src/main/java/com/rappytv/deathfinder/api/util/DeathLocation.java

@@ -0,0 +1,23 @@
+package com.rappytv.deathfinder.api.util;
+
+/**
+ * From <a href="https://github.com/labymod-addons/waypoints/blob/master/api/src/main/java/net/labymod/addons/waypoints/waypoint/WaypointType.java">WaypointType.java</a> because it's accessed without being able to check if Waypoint addon is installed
+ */
+public enum WaypointType {
+
+    /**
+     * A permanent waypoint.
+     */
+    PERMANENT,
+
+    /**
+     * A waypoint that will be deleted after the player leaves the server.
+     */
+    SERVER_SESSION,
+
+    /**
+     * A waypoint that will not be saved to the configuration and thus only be available during the
+     * current game session.
+     */
+    ADDON_MANAGED
+}

api/src/main/java/com/rappytv/deathfinder/api/util/DeathManager.java

@@ -6,19 +6,20 @@ plugins {
 val versions = providers.gradleProperty("net.labymod.minecraft-versions").get().split(";")
 
 group = "org.example"
-version = providers.environmentVariable("VERSION").getOrElse("1.1.0")
+version = providers.environmentVariable("VERSION").getOrElse("1.1.1")
 
 labyMod {
-    defaultPackageName = "com.rappytv.deathfinder" //change this to your main package name (used by all modules)
+    defaultPackageName = "com.rappytv.deathfinder"
     addonInfo {
         namespace = "deathfinder"
         displayName = "Death Finder"
         author = "RappyTV"
         description = "This addon saves your last death point, so you can find your items again."
-        minecraftVersion = "1.8<1.21.1"
+        minecraftVersion = "1.8<1.21.8"
         version = rootProject.version.toString()
 
         addon("labyswaypoints", true)
+        addon("smartchat", true)
     }
 
     minecraft {