[FEAT] APIs for Player Revive mod and Whitelist changes
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/Common/src/main/resources/craterlib.mixins.json
|
||||
+++ b/Common/src/main/resources/craterlib.mixins.json
|
||||
@@ -17,7 +17,8 @@
|
||||
@@ -19,7 +19,8 @@
|
||||
"events.PlayerAdvancementsMixin",
|
||||
"events.PlayerListMixin",
|
||||
"events.ServerPlayerMixin",
|
||||
|
@@ -8,8 +8,8 @@
|
||||
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}")
|
||||
|
||||
modImplementation("me.shedaniel.cloth:cloth-config-forge:${cloth_config}")
|
||||
|
||||
@@ -109,8 +109,8 @@
|
||||
modImplementation("unimaven.curseforge:playerrevive-266890:${player_revive}")
|
||||
@@ -111,8 +111,8 @@
|
||||
setVersionType("release")
|
||||
setChangelog(rootProject.file("changelog.md"))
|
||||
setProjectVersion("${minecraft_version}-${project.version}")
|
||||
|
@@ -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());
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
@@ -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 {
|
||||
|
@@ -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.getPlayer())));
|
||||
+ }
|
||||
+
|
||||
+ @SubscribeEvent
|
||||
+ public void playerBledOutEvent(PlayerBleedOutEvent event) {
|
||||
+ CraterEventBus.INSTANCE.postEvent(com.hypherionmc.craterlib.api.events.compat.PlayerRevivedEvent.of(BridgedPlayer.of(event.getPlayer())));
|
||||
+ }
|
||||
+
|
||||
+}
|
@@ -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")
|
||||
|
@@ -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) {
|
||||
|
@@ -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();
|
||||
- }
|
||||
-}
|
||||
|
@@ -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())));
|
||||
- }
|
||||
-
|
||||
-}
|
@@ -1,6 +1,6 @@
|
||||
--- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java
|
||||
+++ /dev/null
|
||||
@@ -1,78 +1,0 @@
|
||||
@@ -1,92 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.common;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.core.platform.CompatUtils;
|
||||
@@ -78,4 +78,18 @@
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isPlayerBleeding(BridgedPlayer player) {
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean playerBledOut(BridgedPlayer player) {
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean playerRevived(BridgedPlayer player) {
|
||||
- return false;
|
||||
- }
|
||||
-}
|
||||
|
@@ -40,7 +40,7 @@
|
||||
|
||||
maven {
|
||||
name = "Modrinth"
|
||||
@@ -73,11 +66,14 @@
|
||||
@@ -77,11 +70,14 @@
|
||||
shade "me.hypherionmc.moon-config:toml:${moon_config}"
|
||||
shade "me.hypherionmc.moon-config:json:${moon_config}"
|
||||
shade "com.hypherionmc:rpcsdk:${rpc_sdk}"
|
||||
@@ -56,7 +56,7 @@
|
||||
compileOnly 'net.luckperms:api:5.4'
|
||||
compileOnly("org.projectlombok:lombok:${lombok}")
|
||||
annotationProcessor("org.projectlombok:lombok:${lombok}")
|
||||
@@ -124,7 +120,7 @@
|
||||
@@ -128,7 +124,7 @@
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
it.options.encoding = 'UTF-8'
|
||||
|
@@ -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=5335413
|
||||
+creative_core=5335387
|
||||
+ftb_ranks=1802.1.11-build.71
|
||||
+ftb_essentials=1802.2.2-build.83
|
||||
+fabrictailor=1.9.0+1.18.2
|
||||
|
@@ -1,6 +1,6 @@
|
||||
--- a/Common/src/main/resources/craterlib.mixins.json
|
||||
+++ b/Common/src/main/resources/craterlib.mixins.json
|
||||
@@ -17,7 +17,8 @@
|
||||
@@ -19,7 +19,8 @@
|
||||
"events.PlayerAdvancementsMixin",
|
||||
"events.PlayerListMixin",
|
||||
"events.ServerPlayerMixin",
|
||||
|
@@ -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}")
|
||||
|
@@ -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());
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
@@ -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 {
|
||||
|
@@ -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())));
|
||||
+ }
|
||||
+
|
||||
+}
|
@@ -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")
|
||||
|
@@ -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) {
|
||||
|
@@ -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();
|
||||
- }
|
||||
-}
|
||||
|
@@ -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())));
|
||||
- }
|
||||
-
|
||||
-}
|
@@ -1,6 +1,6 @@
|
||||
--- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java
|
||||
+++ /dev/null
|
||||
@@ -1,78 +1,0 @@
|
||||
@@ -1,92 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.common;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.core.platform.CompatUtils;
|
||||
@@ -78,4 +78,18 @@
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isPlayerBleeding(BridgedPlayer player) {
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean playerBledOut(BridgedPlayer player) {
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean playerRevived(BridgedPlayer player) {
|
||||
- return false;
|
||||
- }
|
||||
-}
|
||||
|
@@ -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'
|
||||
|
@@ -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=5491953
|
||||
+creative_core=5491926
|
||||
+ftb_ranks=1902.1.16-build.114
|
||||
+ftb_essentials=1902.3.5-build.135
|
||||
+fabrictailor=2.0.1
|
||||
|
@@ -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}")
|
||||
|
@@ -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());
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
@@ -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 {
|
||||
|
@@ -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())));
|
||||
+ }
|
||||
+
|
||||
+}
|
@@ -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")
|
||||
|
@@ -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) {
|
||||
|
@@ -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();
|
||||
- }
|
||||
-}
|
||||
|
@@ -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())));
|
||||
- }
|
||||
-
|
||||
-}
|
@@ -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'
|
||||
|
@@ -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
|
||||
|
@@ -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}")
|
||||
|
@@ -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());
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
@@ -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 {
|
||||
|
@@ -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())));
|
||||
+ }
|
||||
+
|
||||
+}
|
@@ -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")
|
||||
|
@@ -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) {
|
||||
|
@@ -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();
|
||||
- }
|
||||
-}
|
||||
|
@@ -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())));
|
||||
- }
|
||||
-
|
||||
-}
|
@@ -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'
|
||||
|
@@ -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=4785938
|
||||
+creative_core=4796447
|
||||
+ftb_ranks=2001.1.3
|
||||
+ftb_essentials=2001.2.2
|
||||
+fabrictailor=2.2.1
|
||||
|
@@ -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
|
||||
|
@@ -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}")
|
||||
|
@@ -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);
|
||||
|
@@ -40,7 +40,7 @@
|
||||
|
||||
maven {
|
||||
name = "Modrinth"
|
||||
@@ -124,7 +117,7 @@
|
||||
@@ -128,7 +121,7 @@
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
it.options.encoding = 'UTF-8'
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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}")
|
||||
|
@@ -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());
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
@@ -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 {
|
||||
|
@@ -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())));
|
||||
+ }
|
||||
+
|
||||
+}
|
@@ -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")
|
||||
|
@@ -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) {
|
||||
|
@@ -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();
|
||||
- }
|
||||
-}
|
||||
|
@@ -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())));
|
||||
- }
|
||||
-
|
||||
-}
|
@@ -40,7 +40,7 @@
|
||||
|
||||
maven {
|
||||
name = "Modrinth"
|
||||
@@ -73,7 +65,7 @@
|
||||
@@ -77,7 +69,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 +116,7 @@
|
||||
@@ -128,7 +120,7 @@
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
it.options.encoding = 'UTF-8'
|
||||
|
@@ -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=4798215
|
||||
+creative_core=4798202
|
||||
+ftb_ranks=2001.1.3
|
||||
+ftb_essentials=2001.2.2
|
||||
+fabrictailor=2.2.1
|
||||
|
@@ -1,6 +1,6 @@
|
||||
--- a/Forge/build.gradle
|
||||
+++ /dev/null
|
||||
@@ -1,126 +1,0 @@
|
||||
@@ -1,128 +1,0 @@
|
||||
-// Adjust the output jar name here
|
||||
-archivesBaseName = "${mod_name.replace(" ", "")}-Forge-${minecraft_version}"
|
||||
-
|
||||
@@ -9,6 +9,8 @@
|
||||
- // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
|
||||
-
|
||||
- modImplementation("me.shedaniel.cloth:cloth-config-forge:${cloth_config}")
|
||||
- modImplementation("unimaven.curseforge:playerrevive-266890:${player_revive}")
|
||||
- modImplementation("unimaven.curseforge:creativecore-257814:${creative_core}")
|
||||
-
|
||||
- // Do not edit or remove
|
||||
- implementation project(":Common")
|
||||
|
@@ -1,10 +1,12 @@
|
||||
--- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
|
||||
+++ /dev/null
|
||||
@@ -1,17 +1,0 @@
|
||||
@@ -1,45 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.common;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.core.platform.CompatUtils;
|
||||
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
-import team.creative.playerrevive.api.IBleeding;
|
||||
-import team.creative.playerrevive.server.PlayerReviveServer;
|
||||
-
|
||||
-public class ForgeCompatHelper implements CompatUtils {
|
||||
-
|
||||
@@ -17,4 +19,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();
|
||||
- }
|
||||
-}
|
||||
|
@@ -1,6 +1,6 @@
|
||||
--- a/NeoForge/build.gradle
|
||||
+++ b/NeoForge/build.gradle
|
||||
@@ -37,12 +37,7 @@
|
||||
@@ -39,12 +39,7 @@
|
||||
|
||||
unimined.minecraft {
|
||||
neoForged {
|
||||
|
@@ -1,6 +1,14 @@
|
||||
--- a/gradle.properties
|
||||
+++ b/gradle.properties
|
||||
@@ -43,7 +43,7 @@
|
||||
@@ -39,13 +39,13 @@
|
||||
vanishmod_neo=puxrKAMr
|
||||
ftb_essentials=2101.1.0
|
||||
ftb_ranks=2101.1.1
|
||||
-player_revive=6119534
|
||||
-creative_core=6113754
|
||||
+player_revive=5886329
|
||||
+creative_core=5886272
|
||||
|
||||
# Publishing
|
||||
curse_id=867099
|
||||
modrinth_id=Nn8Wasaq
|
||||
|
@@ -1,6 +1,6 @@
|
||||
--- a/Forge/build.gradle
|
||||
+++ /dev/null
|
||||
@@ -1,126 +1,0 @@
|
||||
@@ -1,128 +1,0 @@
|
||||
-// Adjust the output jar name here
|
||||
-archivesBaseName = "${mod_name.replace(" ", "")}-Forge-${minecraft_version}"
|
||||
-
|
||||
@@ -9,6 +9,8 @@
|
||||
- // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
|
||||
-
|
||||
- modImplementation("me.shedaniel.cloth:cloth-config-forge:${cloth_config}")
|
||||
- modImplementation("unimaven.curseforge:playerrevive-266890:${player_revive}")
|
||||
- modImplementation("unimaven.curseforge:creativecore-257814:${creative_core}")
|
||||
-
|
||||
- // Do not edit or remove
|
||||
- implementation project(":Common")
|
||||
|
@@ -1,10 +1,12 @@
|
||||
--- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
|
||||
+++ /dev/null
|
||||
@@ -1,17 +1,0 @@
|
||||
@@ -1,45 +1,0 @@
|
||||
-package com.hypherionmc.craterlib.common;
|
||||
-
|
||||
-import com.hypherionmc.craterlib.core.platform.CompatUtils;
|
||||
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
|
||||
-import team.creative.playerrevive.api.IBleeding;
|
||||
-import team.creative.playerrevive.server.PlayerReviveServer;
|
||||
-
|
||||
-public class ForgeCompatHelper implements CompatUtils {
|
||||
-
|
||||
@@ -17,4 +19,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();
|
||||
- }
|
||||
-}
|
||||
|
@@ -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")
|
||||
}
|
||||
}
|
||||
@@ -116,8 +111,8 @@
|
||||
@@ -118,8 +113,8 @@
|
||||
setVersionType("release")
|
||||
setChangelog(rootProject.file("changelog.md"))
|
||||
setProjectVersion("${minecraft_version}-${project.version}")
|
||||
|
@@ -25,7 +25,15 @@
|
||||
|
||||
# Mod Dependencies
|
||||
fabrictailor=2.3.1
|
||||
@@ -43,7 +43,7 @@
|
||||
@@ -39,13 +39,13 @@
|
||||
vanishmod_neo=puxrKAMr
|
||||
ftb_essentials=2101.1.0
|
||||
ftb_ranks=2101.1.1
|
||||
-player_revive=6119534
|
||||
-creative_core=6113754
|
||||
+player_revive=6130248
|
||||
+creative_core=6109912
|
||||
|
||||
# Publishing
|
||||
curse_id=867099
|
||||
modrinth_id=Nn8Wasaq
|
||||
|
Reference in New Issue
Block a user