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 14:06:08 +02:00
parent 4c3cc6b034
commit 7f9ff38768
18 changed files with 243 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Common/src/main/java/com/hypherionmc/craterlib/api/events/compat/PlayerBleedOutEvent.java Normal file
View File

@@ -0,0 +1,12 @@
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(staticName = "of")
@Getter
public class PlayerBleedOutEvent extends CraterEvent {
private final BridgedPlayer player;
}

12
Common/src/main/java/com/hypherionmc/craterlib/api/events/compat/PlayerRevivedEvent.java Normal file
View File

@@ -0,0 +1,12 @@
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(staticName = "of")
@Getter
public class PlayerRevivedEvent extends CraterEvent {
private final BridgedPlayer player;
}

26
Common/src/main/java/com/hypherionmc/craterlib/api/events/server/WhitelistChangedEvent.java Normal file
View File

@@ -0,0 +1,26 @@
package com.hypherionmc.craterlib.api.events.server;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
public class WhitelistChangedEvent {
@RequiredArgsConstructor
@Getter
public static final class EntryAdded extends CraterEvent {
private final BridgedGameProfile profile;
}
@RequiredArgsConstructor
@Getter
public static final class EntryRemoved extends CraterEvent {
private final BridgedGameProfile profile;
}
}

3
Common/src/main/java/com/hypherionmc/craterlib/core/platform/CompatUtils.java
View File

@@ -9,5 +9,8 @@ public interface CompatUtils {
boolean isPlayerActive(BridgedPlayer player);
String getSkinUUID(BridgedPlayer player);
boolean isPlayerBleeding(BridgedPlayer player);
boolean playerBledOut(BridgedPlayer player);
boolean playerRevived(BridgedPlayer player);
}

14
Common/src/main/java/com/hypherionmc/craterlib/mixin/events/StoredUserEntryAccessor.java Normal file
View File

@@ -0,0 +1,14 @@
package com.hypherionmc.craterlib.mixin.events;
import net.minecraft.server.players.StoredUserEntry;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(StoredUserEntry.class)
public interface StoredUserEntryAccessor<T> {
@Accessor("user")
@Nullable T getUser();
}

46
Common/src/main/java/com/hypherionmc/craterlib/mixin/events/WhitelistMixin.java Normal file
View File

@@ -0,0 +1,46 @@
package com.hypherionmc.craterlib.mixin.events;
import com.hypherionmc.craterlib.api.events.server.WhitelistChangedEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import com.mojang.authlib.GameProfile;
import net.minecraft.server.players.StoredUserEntry;
import net.minecraft.server.players.StoredUserList;
import net.minecraft.server.players.UserWhiteListEntry;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@SuppressWarnings({"unchecked", "rawtypes"})
@Mixin(StoredUserList.class)
public abstract class WhitelistMixin<K, V extends StoredUserEntry<K>> {
@Shadow protected abstract boolean contains(K k0);
@Inject(method = "add", at = @At("HEAD"))
private void injectAddEvent(V arg, CallbackInfo ci) {
try {
if (arg instanceof UserWhiteListEntry entry) {
StoredUserEntryAccessor entryAccessor = (StoredUserEntryAccessor) entry;
if (entryAccessor.getUser() != null && !contains((K) entryAccessor.getUser())) {
CraterEventBus.INSTANCE.postEvent(new WhitelistChangedEvent.EntryAdded(BridgedGameProfile.of((GameProfile) entryAccessor.getUser())));
}
}
} catch (Exception ignored) {}
}
@Inject(method = "remove(Lnet/minecraft/server/players/StoredUserEntry;)V", at = @At("HEAD"))
private void injectRemoveEvent(V arg, CallbackInfo ci) {
try {
if (arg instanceof UserWhiteListEntry entry) {
StoredUserEntryAccessor entryAccessor = (StoredUserEntryAccessor) entry;
if (entryAccessor.getUser() != null && contains((K) entryAccessor.getUser())) {
CraterEventBus.INSTANCE.postEvent(new WhitelistChangedEvent.EntryRemoved(BridgedGameProfile.of((GameProfile) entryAccessor.getUser())));
}
}
} catch (Exception ignored) {}
}
}

2
Common/src/main/resources/craterlib.mixins.json
View File

@@ -4,6 +4,8 @@
"package": "com.hypherionmc.craterlib.mixin",
"compatibilityLevel": "JAVA_17",
"mixins": [
"events.StoredUserEntryAccessor",
"events.WhitelistMixin"
],
"client": [
"ChatInputSuggestorMixin",