[FEAT] APIs for Player Revive mod and Whitelist changes

This commit is contained in:
2025-02-01 15:30:30 +02:00
parent 74701a7817
commit a4aa7108e5
202 changed files with 2410 additions and 96 deletions

View File

@@ -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}")

View File

@@ -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

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle
@@ -37,12 +37,7 @@
@@ -39,12 +39,7 @@
unimined.minecraft {
neoForged {
@@ -14,7 +14,7 @@
mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
}
}
@@ -61,7 +56,7 @@
@@ -63,7 +58,7 @@
from project(":Common").sourceSets.main.resources
def buildProps = project.properties.clone()
@@ -23,7 +23,7 @@
expand buildProps
}
}
@@ -116,8 +111,8 @@
@@ -118,8 +113,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,11 +1,12 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
@@ -1,17 +1,21 @@
@@ -1,18 +1,22 @@
package com.hypherionmc.craterlib;
-import com.hypherionmc.craterlib.client.NeoForgeClientHelper;
+import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
import com.hypherionmc.craterlib.common.NeoForgeServerEvents;
import com.hypherionmc.craterlib.compat.PlayerReviveEvents;
import com.hypherionmc.craterlib.compat.Vanish;
+import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
@@ -24,7 +25,7 @@
import net.neoforged.fml.loading.FMLLoader;
import net.neoforged.neoforge.common.NeoForge;
@@ -23,7 +27,6 @@
@@ -24,7 +28,6 @@
public CraterLib(IEventBus eventBus) {
NeoForge.EVENT_BUS.register(new NeoForgeServerEvents());
eventBus.addListener(this::commonSetup);
@@ -32,7 +33,7 @@
handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER);
if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) {
@@ -33,9 +36,9 @@
@@ -38,9 +41,9 @@
public void commonSetup(FMLCommonSetupEvent evt) {
new CraterPacketNetwork(handler);

View File

@@ -40,7 +40,7 @@
maven {
name = "Modrinth"
@@ -124,7 +117,7 @@
@@ -128,7 +121,7 @@
tasks.withType(JavaCompile).configureEach {
it.options.encoding = 'UTF-8'

View File

@@ -24,7 +24,7 @@
# Dependencies
moon_config=1.0.10
@@ -29,21 +29,21 @@
@@ -29,23 +29,23 @@
adventure=4.17.0
rpc_sdk=1.0
discord_formatter=2.0.0
@@ -42,6 +42,10 @@
vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
-ftb_ranks=2101.1.1
-player_revive=6119534
-creative_core=6113754
+player_revive=5019850
+creative_core=5140174
+ftb_ranks=2004.2.0
+ftb_essentials=2004.1.3