firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[FEAT] APIs for Player Revive mod and Whitelist changes

Browse Source
This commit is contained in:
HypherionSA
2025-02-01 15:30:30 +02:00
parent 74701a7817
commit a4aa7108e5
202 changed files with 2410 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/1.19.3/Forge/build.gradle.patch
View File

@@ -11,8 +11,8 @@
+ stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
modImplementation("me.shedaniel.cloth:cloth-config-forge:${cloth_config}")
@@ -109,8 +112,8 @@
modImplementation("unimaven.curseforge:playerrevive-266890:${player_revive}")
@@ -111,8 +114,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

9
patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch
View File

@@ -1,20 +1,25 @@
--- a/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
@@ -2,6 +2,7 @@
@@ -2,6 +2,8 @@
import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
import com.hypherionmc.craterlib.common.ForgeServerEvents;
+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;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
@@ -32,5 +33,9 @@
@@ -32,5 +34,13 @@
LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
CraterEventBus.INSTANCE.postEvent(event);
});
+
+ if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) {
+ MinecraftForge.EVENT_BUS.register(new Vanish());
+ }
+
+ if (ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive")) {
+ MinecraftForge.EVENT_BUS.register(new PlayerReviveEvents());
+ }
}
}

4
patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
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,20 @@
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 {

26
patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/compat/PlayerReviveEvents.java.patch Normal file
View File

@@ -0,0 +1,26 @@
--- /dev/null
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/compat/PlayerReviveEvents.java
@@ -1,0 +1,23 @@
+package com.hypherionmc.craterlib.compat;
+
+import com.hypherionmc.craterlib.core.event.CraterEventBus;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import lombok.NoArgsConstructor;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import team.creative.playerrevive.api.event.PlayerBleedOutEvent;
+import team.creative.playerrevive.api.event.PlayerRevivedEvent;
+
+@NoArgsConstructor
+public class PlayerReviveEvents {
+
+ @SubscribeEvent
+ public void playerRevived(PlayerRevivedEvent event) {
+ CraterEventBus.INSTANCE.postEvent(com.hypherionmc.craterlib.api.events.compat.PlayerRevivedEvent.of(BridgedPlayer.of(event.getEntity())));
+ }
+
+ @SubscribeEvent
+ public void playerBledOutEvent(PlayerBleedOutEvent event) {
+ CraterEventBus.INSTANCE.postEvent(com.hypherionmc.craterlib.api.events.compat.PlayerRevivedEvent.of(BridgedPlayer.of(event.getEntity())));
+ }
+
+}

4
patches/1.19.3/NeoForge/build.gradle.patch
View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle
+++ /dev/null
@@ -1,133 +1,0 @@
@@ -1,135 +1,0 @@
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
-
-dependencies {
@@ -11,6 +11,8 @@
- stupidRemapArch("dev.ftb.mods:ftb-ranks-neoforge:${ftb_ranks}")
-
- modImplementation("me.shedaniel.cloth:cloth-config-neoforge:${cloth_config}")
- modImplementation("unimaven.curseforge:playerrevive-266890:${player_revive}")
- modImplementation("unimaven.curseforge:creativecore-257814:${creative_core}")
-
- // Do not edit or remove
- implementation project(":Common")

7
patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch
View File

@@ -1,10 +1,11 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
+++ /dev/null
@@ -1,41 +1,0 @@
@@ -1,46 +1,0 @@
-package com.hypherionmc.craterlib;
-
-import com.hypherionmc.craterlib.client.NeoForgeClientHelper;
-import com.hypherionmc.craterlib.common.NeoForgeServerEvents;
-import com.hypherionmc.craterlib.compat.PlayerReviveEvents;
-import com.hypherionmc.craterlib.compat.Vanish;
-import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
-import com.hypherionmc.craterlib.core.networking.PacketRegistry;
@@ -32,6 +33,10 @@
- if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) {
- NeoForge.EVENT_BUS.register(new Vanish());
- }
-
- if (ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive")) {
- NeoForge.EVENT_BUS.register(new PlayerReviveEvents());
- }
- }
-
- public void commonSetup(FMLCommonSetupEvent evt) {

30
patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch
View File

@@ -1,12 +1,14 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java
+++ /dev/null
@@ -1,22 +1,0 @@
@@ -1,50 +1,0 @@
-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;
-import team.creative.playerrevive.api.IBleeding;
-import team.creative.playerrevive.server.PlayerReviveServer;
-
-public class NeoForgeCompatHelper implements CompatUtils {
-
@@ -22,4 +24,30 @@
- public String getSkinUUID(BridgedPlayer player) {
- return player.getStringUUID();
- }
-
- @Override
- public boolean isPlayerBleeding(BridgedPlayer player) {
- if (!ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive"))
- return false;
-
- return PlayerReviveServer.isBleeding(player.toMojangServerPlayer());
- }
-
- @Override
- public boolean playerBledOut(BridgedPlayer player) {
- if (!ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive"))
- return false;
-
- IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
- return bleeding != null && bleeding.bledOut();
- }
-
- @Override
- public boolean playerRevived(BridgedPlayer player) {
- if (!ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive"))
- return false;
-
- IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
- return bleeding != null && bleeding.revived();
- }
-}

26
patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/compat/PlayerReviveEvents.java.patch Normal file
View File

@@ -0,0 +1,26 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/compat/PlayerReviveEvents.java
+++ /dev/null
@@ -1,23 +1,0 @@
-package com.hypherionmc.craterlib.compat;
-
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
-import lombok.NoArgsConstructor;
-import net.neoforged.bus.api.SubscribeEvent;
-import team.creative.playerrevive.api.event.PlayerBleedOutEvent;
-import team.creative.playerrevive.api.event.PlayerRevivedEvent;
-
-@NoArgsConstructor
-public class PlayerReviveEvents {
-
- @SubscribeEvent
- public void playerRevived(PlayerRevivedEvent event) {
- CraterEventBus.INSTANCE.postEvent(com.hypherionmc.craterlib.api.events.compat.PlayerRevivedEvent.of(BridgedPlayer.of(event.getEntity())));
- }
-
- @SubscribeEvent
- public void playerBledOutEvent(PlayerBleedOutEvent event) {
- CraterEventBus.INSTANCE.postEvent(com.hypherionmc.craterlib.api.events.compat.PlayerRevivedEvent.of(BridgedPlayer.of(event.getEntity())));
- }
-
-}

4
patches/1.19.3/build.gradle.patch
View File

@@ -40,7 +40,7 @@
maven {
name = "Modrinth"
@@ -73,7 +66,7 @@
@@ -77,7 +70,7 @@
shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "me.hypherionmc.moon-config:json:${moon_config}"
shade "com.hypherionmc:rpcsdk:${rpc_sdk}"
@@ -49,7 +49,7 @@
shade "net.kyori:adventure-api:${adventure}"
shade "net.kyori:adventure-text-serializer-gson:${adventure}"
shade "net.kyori:adventure-text-minimessage:${adventure}"
@@ -124,7 +117,7 @@
@@ -128,7 +121,7 @@
tasks.withType(JavaCompile).configureEach {
it.options.encoding = 'UTF-8'

6
patches/1.19.3/gradle.properties.patch
View File

@@ -23,7 +23,7 @@
# Dependencies
moon_config=1.0.10
@@ -29,21 +26,20 @@
@@ -29,23 +26,22 @@
adventure=4.17.0
rpc_sdk=1.0
discord_formatter=2.0.0
@@ -38,6 +38,10 @@
-vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
-ftb_ranks=2101.1.1
-player_revive=6119534
-creative_core=6113754
+player_revive=4353422
+creative_core=4407520
+ftb_ranks=1904.1.1-build.82
+ftb_essentials=1904.1.0-build.81-SNAPSHOT
+fabrictailor=2.0.2