Merge pull request #22 from RappyLabyAddons/feat/update

Support new versions, use java 21

.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

@@ -20,8 +20,8 @@ labyMod {
         displayName = "Death Finder"
         author = "RappyTV"
         description = "This addon saves your last death point, so you can find your items again."
-        minecraftVersion = "1.8<1.20.4"
-        version = System.getenv().getOrDefault("VERSION", "1.0.7")
+        minecraftVersion = "1.8<1.21"
+        version = System.getenv().getOrDefault("VERSION", "1.0.8")
     }
 
     minecraft {
@@ -36,7 +36,10 @@ labyMod {
                 "1.19.4",
                 "1.20.1",
                 "1.20.2",
-                "1.20.4"
+                "1.20.4",
+                "1.20.5",
+                "1.20.6",
+                "1.21"
         ) { version, provider ->
             configureRun(provider, version)
         }
@@ -77,11 +80,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
 }

game-runner/src/v1_20_5/java/com/rappytv/deathfinder/v1_20_5/DeathScreenMixin.java

@@ -0,0 +1,38 @@
+package com.rappytv.deathfinder.v1_20_5;
+
+import com.rappytv.deathfinder.DeathFinderAddon;
+import com.rappytv.deathfinder.events.DeathEvent;
+import com.rappytv.deathfinder.util.Location;
+import net.labymod.api.Laby;
+import net.minecraft.client.gui.screens.DeathScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(DeathScreen.class)
+public class DeathScreenMixin extends Screen {
+
+    protected DeathScreenMixin(Component title) {
+        super(title);
+    }
+
+    @Inject(method = "init", at = @At("TAIL"))
+    public void onDeathScreen(CallbackInfo ci) {
+        if(this.minecraft == null || this.minecraft.player == null) return;
+
+        LocalPlayer player = this.minecraft.player;
+        Location deathLocation = new Location(player.getX(), player.getY(), player.getZ());
+
+        if(DeathFinderAddon.get().configuration().saveRotation().get()) {
+            deathLocation.setYaw(player.getYRot());
+            deathLocation.setPitch(player.getXRot());
+        }
+        if(deathLocation.equals(DeathFinderAddon.getDeathLocation())) return;
+
+        Laby.fireEvent(new DeathEvent(deathLocation));
+    }
+}

game-runner/src/v1_20_6/java/com/rappytv/deathfinder/v1_20_6/DeathScreenMixin.java

@@ -0,0 +1,38 @@
+package com.rappytv.deathfinder.v1_20_6;
+
+import com.rappytv.deathfinder.DeathFinderAddon;
+import com.rappytv.deathfinder.events.DeathEvent;
+import com.rappytv.deathfinder.util.Location;
+import net.labymod.api.Laby;
+import net.minecraft.client.gui.screens.DeathScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(DeathScreen.class)
+public class DeathScreenMixin extends Screen {
+
+    protected DeathScreenMixin(Component title) {
+        super(title);
+    }
+
+    @Inject(method = "init", at = @At("TAIL"))
+    public void onDeathScreen(CallbackInfo ci) {
+        if(this.minecraft == null || this.minecraft.player == null) return;
+
+        LocalPlayer player = this.minecraft.player;
+        Location deathLocation = new Location(player.getX(), player.getY(), player.getZ());
+
+        if(DeathFinderAddon.get().configuration().saveRotation().get()) {
+            deathLocation.setYaw(player.getYRot());
+            deathLocation.setPitch(player.getXRot());
+        }
+        if(deathLocation.equals(DeathFinderAddon.getDeathLocation())) return;
+
+        Laby.fireEvent(new DeathEvent(deathLocation));
+    }
+}

game-runner/src/v1_21/java/com/rappytv/deathfinder/v1_21/DeathScreenMixin.java

@@ -0,0 +1,38 @@
+package com.rappytv.deathfinder.v1_21;
+
+import com.rappytv.deathfinder.DeathFinderAddon;
+import com.rappytv.deathfinder.events.DeathEvent;
+import com.rappytv.deathfinder.util.Location;
+import net.labymod.api.Laby;
+import net.minecraft.client.gui.screens.DeathScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(DeathScreen.class)
+public class DeathScreenMixin extends Screen {
+
+    protected DeathScreenMixin(Component title) {
+        super(title);
+    }
+
+    @Inject(method = "init", at = @At("TAIL"))
+    public void onDeathScreen(CallbackInfo ci) {
+        if(this.minecraft == null || this.minecraft.player == null) return;
+
+        LocalPlayer player = this.minecraft.player;
+        Location deathLocation = new Location(player.getX(), player.getY(), player.getZ());
+
+        if(DeathFinderAddon.get().configuration().saveRotation().get()) {
+            deathLocation.setYaw(player.getYRot());
+            deathLocation.setPitch(player.getXRot());
+        }
+        if(deathLocation.equals(DeathFinderAddon.getDeathLocation())) return;
+
+        Laby.fireEvent(new DeathEvent(deathLocation));
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,7 +1,7 @@
 rootProject.name = "deathfinder"
 
 pluginManagement {
-    val labyGradlePluginVersion = "0.3.40"
+    val labyGradlePluginVersion = "0.4.1"
     plugins {
         id("net.labymod.gradle") version (labyGradlePluginVersion)
     }