[FEAT] APIs for Player Revive mod and Whitelist changes
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/Forge/build.gradle
|
||||
+++ b/Forge/build.gradle
|
||||
@@ -3,7 +3,10 @@
|
||||
@@ -3,11 +3,16 @@
|
||||
|
||||
dependencies {
|
||||
// Compat
|
||||
@@ -11,8 +11,16 @@
|
||||
+ stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
|
||||
|
||||
modImplementation("me.shedaniel.cloth:cloth-config-forge:${cloth_config}")
|
||||
- modImplementation("unimaven.curseforge:playerrevive-266890:${player_revive}")
|
||||
- modImplementation("unimaven.curseforge:creativecore-257814:${creative_core}")
|
||||
+
|
||||
+ // NOT AVAILABLE FOR FORGE
|
||||
+ //modImplementation("unimaven.curseforge:playerrevive-266890:5019850")
|
||||
+ //modImplementation("unimaven.curseforge:creativecore-257814:5140174")
|
||||
|
||||
@@ -109,8 +112,8 @@
|
||||
// Do not edit or remove
|
||||
implementation project(":Common")
|
||||
@@ -111,8 +116,8 @@
|
||||
setVersionType("release")
|
||||
setChangelog(rootProject.file("changelog.md"))
|
||||
setProjectVersion("${minecraft_version}-${project.version}")
|
||||
|
@@ -1,11 +1,13 @@
|
||||
--- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
|
||||
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
|
||||
@@ -1,13 +1,18 @@
|
||||
@@ -1,15 +1,18 @@
|
||||
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 team.creative.playerrevive.api.IBleeding;
|
||||
-import team.creative.playerrevive.server.PlayerReviveServer;
|
||||
+import redstonedubstep.mods.vanishmod.VanishUtil;
|
||||
|
||||
public class ForgeCompatHelper implements CompatUtils {
|
||||
@@ -19,4 +21,26 @@
|
||||
+ return !VanishUtil.isVanished(player.toMojangServerPlayer());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -19,19 +22,12 @@
|
||||
|
||||
@Override
|
||||
public boolean isPlayerBleeding(BridgedPlayer player) {
|
||||
- if (!ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive"))
|
||||
- return false;
|
||||
-
|
||||
- return PlayerReviveServer.isBleeding(player.toMojangServerPlayer());
|
||||
+ return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean playerBledOut(BridgedPlayer player) {
|
||||
- if (!ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive"))
|
||||
- return false;
|
||||
-
|
||||
- IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
|
||||
- return bleeding != null && bleeding.bledOut();
|
||||
+ return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user