Merge remote-tracking branch 'origin/1.21.10'

.gitignore

@@ -39,3 +39,5 @@ hs_err_pid*
 .gradle
 build/
 !gradle/wrapper/gradle-wrapper.jar
+
+*.bat

build.gradle.kts

@@ -41,7 +41,7 @@ dependencies {
     compileOnly("com.alttd.cosmos:cosmos-api:26.1.2.build.11-release") {
         isChanging = true
     }
-    compileOnly("de.keyle:mypet:3.11-SNAPSHOT")
+    compileOnly("de.keyle:mypet-api:4.0.0-SNAPSHOT")
     compileOnly("com.alttd:VillagerShopUI:1.1-SNAPSHOT") {
         isChanging = true
     }

settings.gradle.kts

@@ -1,18 +1,23 @@
-import org.gradle.kotlin.dsl.maven
-
 rootProject.name = "AFKDetector"
 
+val nexusUser = providers.gradleProperty("alttdSnapshotUsername").orNull ?: System.getenv("NEXUS_USERNAME")
+val nexusPass = providers.gradleProperty("alttdSnapshotPassword").orNull ?: System.getenv("NEXUS_PASSWORD")
+
 dependencyResolutionManagement {
     repositories {
+        mavenLocal()
         mavenCentral()
-        maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy
-        maven("https://repo.alttd.com/repository/alttd-snapshot/")
         maven {
-            name = "AlttdNexus"
+            url = uri("https://repo.alttd.com/repository/alttd-snapshot/")
-            url = uri(
+            credentials {
-                "https://repo.alttd.com/repository/alttd/"
+                username = nexusUser
-            )
+                password = nexusPass
-            credentials(PasswordCredentials::class)
+            }
+        }
+        maven("https://repo.papermc.io/repository/maven-public/")
+        maven {
+            name = "userderezzedRepoSnapshots"
+            url = uri("https://repo.userderezzed.dev/snapshots")
         }
     }
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)

src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java

@@ -4,8 +4,9 @@ import com.alttd.afkdectector.AFKDetector;
 import com.alttd.afkdectector.config.Config;
 import com.alttd.afkdectector.config.Messages;
 import de.Keyle.MyPet.MyPetApi;
-import de.Keyle.MyPet.api.entity.MyPet;
+import de.Keyle.MyPet.api.entity.Pet;
 import de.Keyle.MyPet.api.player.MyPetPlayer;
+import de.Keyle.MyPet.api.plugin.MyPetPlugin;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
@@ -138,10 +139,10 @@ public class AFKPlayer {
         if (!AFKDetector.myPetEnabled) return;
         MyPetPlayer myPetPlayer = MyPetApi.getPlayerManager().getMyPetPlayer(player);
 
-        if (myPetPlayer == null || !myPetPlayer.hasMyPet() || !myPetPlayer.getMyPet().getStatus().equals(MyPet.PetState.Here))
+        if (myPetPlayer == null || !myPetPlayer.hasPet() || !myPetPlayer.getPet().getStatus().equals(Pet.PetState.Here))
             return;
 
-        MyPet myPet = myPetPlayer.getMyPet();
+        Pet myPet = myPetPlayer.getPet();
         myPet.removePet();
     }
 }