diff --git a/1.21/Fabric/build.gradle b/1.21/Fabric/build.gradle index 43d7ee6..78bcead 100644 --- a/1.21/Fabric/build.gradle +++ b/1.21/Fabric/build.gradle @@ -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") diff --git a/1.21/NeoForge/build.gradle b/1.21/NeoForge/build.gradle index 94ff86f..b3c4eba 100644 --- a/1.21/NeoForge/build.gradle +++ b/1.21/NeoForge/build.gradle @@ -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") diff --git a/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch new file mode 100644 index 0000000..7272e3a --- /dev/null +++ b/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch @@ -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 diff --git a/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch new file mode 100644 index 0000000..7272e3a --- /dev/null +++ b/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch @@ -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 diff --git a/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch new file mode 100644 index 0000000..7272e3a --- /dev/null +++ b/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch @@ -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 diff --git a/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch new file mode 100644 index 0000000..7272e3a --- /dev/null +++ b/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch @@ -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 diff --git a/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch new file mode 100644 index 0000000..7272e3a --- /dev/null +++ b/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch @@ -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 diff --git a/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch new file mode 100644 index 0000000..7272e3a --- /dev/null +++ b/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch @@ -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