diff --git a/.gitignore b/.gitignore index d9ca1fc..367a4d2 100755 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,6 @@ target/ hs_err_pid* .gradle build/ -!gradle/wrapper/gradle-wrapper.jar \ No newline at end of file +!gradle/wrapper/gradle-wrapper.jar + +*.bat diff --git a/build.gradle.kts b/build.gradle.kts index fb03644..bc45ea5 100644 --- a/build.gradle.kts +++ b/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 } diff --git a/settings.gradle.kts b/settings.gradle.kts index 54cebbc..d3402ad 100644 --- a/settings.gradle.kts +++ b/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/" - ) - credentials(PasswordCredentials::class) + url = uri("https://repo.alttd.com/repository/alttd-snapshot/") + credentials { + username = nexusUser + password = nexusPass + } + } + 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) diff --git a/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java b/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java index 69dd71a..4516898 100755 --- a/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java +++ b/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(); } }