Compare commits

..

No commits in common. "02f89bceabcc8730311414c57104f1172892e511" and "d0c324594eca72c9a4f57ddbd1fc32b36d309787" have entirely different histories.

4 changed files with 14 additions and 22 deletions

2
.gitignore vendored
View File

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

View File

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

View File

@ -1,23 +1,18 @@
rootProject.name = "AFKDetector" import org.gradle.kotlin.dsl.maven
val nexusUser = providers.gradleProperty("alttdSnapshotUsername").orNull ?: System.getenv("NEXUS_USERNAME") rootProject.name = "AFKDetector"
val nexusPass = providers.gradleProperty("alttdSnapshotPassword").orNull ?: System.getenv("NEXUS_PASSWORD")
dependencyResolutionManagement { dependencyResolutionManagement {
repositories { repositories {
mavenLocal()
mavenCentral() mavenCentral()
maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy
maven("https://repo.alttd.com/repository/alttd-snapshot/")
maven { maven {
url = uri("https://repo.alttd.com/repository/alttd-snapshot/") name = "AlttdNexus"
credentials { url = uri(
username = nexusUser "https://repo.alttd.com/repository/alttd/"
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) repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)

View File

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