[BUG] Fix VanishMod integration being broken on Forge

This commit is contained in:
2024-08-08 21:42:30 +02:00
parent eb00a3ec26
commit 04d4ea6520
8 changed files with 124 additions and 4 deletions

View File

@@ -112,8 +112,8 @@ publisher {
setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}")
setDisplayName("[FABRIC/QUILT 1.21.0] CraterLib - ${project.version}")
setGameVersions("1.21")
setDisplayName("[FABRIC/QUILT 1.21.x] CraterLib - ${project.version}")
setGameVersions("1.21", "1.21.1")
setLoaders("fabric", "quilt")
setArtifact(remapJar)
setCurseEnvironment("both")

View File

@@ -105,8 +105,8 @@ publisher {
setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
setProjectVersion("${minecraft_version}-${project.version}")
setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
setGameVersions("1.21")
setDisplayName("[NeoForge 1.21.x] CraterLib - ${project.version}")
setGameVersions("1.21", "1.21.1")
setLoaders("neoforge")
setArtifact(remapJar)
setCurseEnvironment("both")

View File

@@ -0,0 +1,20 @@
--- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -2,12 +2,16 @@
import com.hypherionmc.craterlib.core.platform.CompatUtils;
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) {
- return true;
+ if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+ return true;
+
+ return VanishUtil.isVanished(player.toMojangServerPlayer());
}
@Override

View File

@@ -0,0 +1,20 @@
--- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -2,12 +2,16 @@
import com.hypherionmc.craterlib.core.platform.CompatUtils;
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) {
- return true;
+ if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+ return true;
+
+ return VanishUtil.isVanished(player.toMojangServerPlayer());
}
@Override

View File

@@ -0,0 +1,20 @@
--- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -2,12 +2,16 @@
import com.hypherionmc.craterlib.core.platform.CompatUtils;
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) {
- return true;
+ if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+ return true;
+
+ return VanishUtil.isVanished(player.toMojangServerPlayer());
}
@Override

View File

@@ -0,0 +1,20 @@
--- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -2,12 +2,16 @@
import com.hypherionmc.craterlib.core.platform.CompatUtils;
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) {
- return true;
+ if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+ return true;
+
+ return VanishUtil.isVanished(player.toMojangServerPlayer());
}
@Override

View File

@@ -0,0 +1,20 @@
--- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -2,12 +2,16 @@
import com.hypherionmc.craterlib.core.platform.CompatUtils;
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) {
- return true;
+ if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+ return true;
+
+ return VanishUtil.isVanished(player.toMojangServerPlayer());
}
@Override

View File

@@ -0,0 +1,20 @@
--- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -2,12 +2,16 @@
import com.hypherionmc.craterlib.core.platform.CompatUtils;
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) {
- return true;
+ if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+ return true;
+
+ return VanishUtil.isVanished(player.toMojangServerPlayer());
}
@Override