diff --git a/.jenkins/Jenkinsfile.deploy b/.jenkins/Jenkinsfile.deploy index 0d4b71c..961e2fd 100644 --- a/.jenkins/Jenkinsfile.deploy +++ b/.jenkins/Jenkinsfile.deploy @@ -1,10 +1,11 @@ pipeline { agent { - label "master" - } - tools { - jdk "JAVA17" + docker { + image "registry.firstdark.dev/java17:latest" + alwaysPull true + } } + stages { stage("Notify Discord") { steps { diff --git a/.jenkins/Jenkinsfile.snapshot b/.jenkins/Jenkinsfile.snapshot index 038eb50..eb5ef48 100644 --- a/.jenkins/Jenkinsfile.snapshot +++ b/.jenkins/Jenkinsfile.snapshot @@ -3,10 +3,10 @@ def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae59 pipeline { agent { - label "master" - } - tools { - jdk "JAVA17" + docker { + image "registry.firstdark.dev/java17:latest" + alwaysPull true + } } stages { diff --git a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java index 34d519d..f325837 100644 --- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java +++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java @@ -1,18 +1,13 @@ package com.hypherionmc.craterlib.common; import com.hypherionmc.craterlib.core.platform.CompatUtils; -import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; -import redstonedubstep.mods.vanishmod.VanishUtil; public class ForgeCompatHelper implements CompatUtils { @Override public boolean isPlayerActive(BridgedPlayer player) { - if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) - return true; - - return VanishUtil.isVanished(player.toMojangServerPlayer()); + return true; } @Override diff --git a/gradle.properties b/gradle.properties index ddccf64..0e8bdfc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,7 +39,7 @@ vanishmod_neo=puxrKAMr # Publishing curse_id=867099 modrinth_id=Nn8Wasaq -release_type=release +release_type=port # Gradle org.gradle.jvmargs=-Xmx3G