[WIP] FTB Ranks/LuckPerms API's

This commit is contained in:
2024-11-25 17:24:45 +02:00
parent bd73d19674
commit b1c7a9de7f
136 changed files with 2420 additions and 820 deletions

View File

@@ -1,6 +1,7 @@
archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies {
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
}

View File

@@ -0,0 +1,56 @@
// @excludeplugin
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.compat.ftbranks.BridgedRank;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import com.mojang.authlib.GameProfile;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.Getter;
public class FTBRankEvents {
@Getter
public static class RankAddedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankAddedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankAddedEvent of(GameProfile profile, Rank rank) {
return new RankAddedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankRemovedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankRemovedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankRemovedEvent of(GameProfile profile, Rank rank) {
return new RankRemovedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankDeletedEvent extends CraterEvent {
private final BridgedRank rank;
private RankDeletedEvent(BridgedRank rank) {
this.rank = rank;
}
public static RankDeletedEvent of(Rank rank) {
return new RankDeletedEvent(BridgedRank.of(rank));
}
}
}

View File

@@ -0,0 +1,32 @@
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import lombok.RequiredArgsConstructor;
import java.util.UUID;
public class LuckPermsCompatEvents {
@RequiredArgsConstructor(staticName = "of")
public static class GroupAddedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
@RequiredArgsConstructor(staticName = "of")
public static class GroupRemovedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
}

View File

@@ -1,20 +1,102 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.api.events.compat.LuckPermsCompatEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider;
import net.luckperms.api.event.EventBus;
import net.luckperms.api.event.node.NodeMutateEvent;
import net.luckperms.api.model.group.Group;
import net.luckperms.api.model.user.User;
import net.luckperms.api.node.NodeType;
import net.luckperms.api.node.types.InheritanceNode;
import net.minecraft.server.level.ServerPlayer;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
public class LuckPermsCompat {
public static final LuckPermsCompat INSTANCE = new LuckPermsCompat();
private final LuckPerms luckPerms = LuckPermsProvider.get();
LuckPermsCompat() {}
LuckPermsCompat() {
EventBus bus = luckPerms.getEventBus();
bus.subscribe(NodeMutateEvent.class, e -> {
if (!e.isUser())
return;
User user = (User) e.getTarget();
Set<InheritanceNode> addedInheritance = e.getDataAfter().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataBefore().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
Set<InheritanceNode> removedInheritance = e.getDataBefore().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataAfter().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
if(addedInheritance.isEmpty() && removedInheritance.isEmpty()) return;
addedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupAddedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
removedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupRemovedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
});
}
public boolean hasPermission(ServerPlayer player, String perm) {
User luckPermsUser = luckPerms.getPlayerAdapter(ServerPlayer.class).getUser(player);
return luckPermsUser.getCachedData().getPermissionData().checkPermission(perm).asBoolean();
}
public boolean hasGroup(UUID uuid, String group) {
return getUserGroups(uuid).stream().anyMatch(g -> g.equalsIgnoreCase(group));
}
public Set<String> getUserGroups(UUID uuid) {
User user = luckPerms.getUserManager().getUser(uuid);
if (user == null)
return new HashSet<>();
return user.getNodes(NodeType.INHERITANCE).stream().map(InheritanceNode::getGroupName).collect(Collectors.toSet());
}
public boolean addGroupToUser(UUID uuid, String group) {
AtomicBoolean added = new AtomicBoolean(false);
Group g = luckPerms.getGroupManager().getGroup(group);
if (g == null) {
return false;
}
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().add(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
added.set(true);
});
return added.get();
}
public boolean removeGroupFromUser(UUID uuid, String group) {
AtomicBoolean removed = new AtomicBoolean(false);
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().remove(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
removed.set(true);
});
return removed.get();
}
}

View File

@@ -0,0 +1,24 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(staticName = "of")
public class BridgedRank {
private final Rank internal;
public String name() {
return internal.getName();
}
public String id() {
return internal.getId();
}
public Rank toFtb() {
return internal;
}
}

View File

@@ -0,0 +1,83 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import com.hypherionmc.craterlib.api.events.compat.FTBRankEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import dev.ftb.mods.ftbranks.api.FTBRanksAPI;
import dev.ftb.mods.ftbranks.api.event.PlayerAddedToRankEvent;
import dev.ftb.mods.ftbranks.api.event.PlayerRemovedFromRankEvent;
import dev.ftb.mods.ftbranks.api.event.RankDeletedEvent;
import dev.ftb.mods.ftbranks.api.event.RankEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
public class FTBRanks {
public static final FTBRanks INSTANCE = new FTBRanks();
private FTBRanks() {
registerEvents();
}
public List<BridgedRank> getPlayerRanks(BridgedGameProfile profile) {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.INSTANCE.getManager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
return ranks;
}
public List<BridgedRank> getAllRanks() {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.INSTANCE.getManager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
return ranks;
}
public boolean hasRank(BridgedGameProfile profile, String rank) {
return getPlayerRanks(profile).stream().anyMatch(r -> r.toFtb().getName().equalsIgnoreCase(rank) || r.toFtb().getId().equalsIgnoreCase(rank));
}
public boolean addRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didAddRank = new AtomicBoolean(false);
FTBRanksAPI.INSTANCE.getManager().getRank(rank).ifPresent(r -> {
r.add(profile.toMojang());
didAddRank.set(true);
});
return didAddRank.get();
}
public boolean removeRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didRemoveRank = new AtomicBoolean(false);
FTBRanksAPI.INSTANCE.getManager().getRank(rank).ifPresent(r -> {
r.remove(profile.toMojang());
didRemoveRank.set(true);
});
return didRemoveRank.get();
}
public void registerEvents() {
RankEvent.ADD_PLAYER.register(this::playerAddedToRank);
RankEvent.REMOVE_PLAYER.register(this::playerRemovedFromRank);
RankEvent.DELETED.register(this::rankDeleted);
}
private void rankDeleted(RankDeletedEvent rankDeletedEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankDeletedEvent.of(rankDeletedEvent.getRank()));
}
private void playerRemovedFromRank(PlayerRemovedFromRankEvent playerRemovedFromRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankRemovedEvent.of(playerRemovedFromRankEvent.getPlayer(), playerRemovedFromRankEvent.getRank()));
}
private void playerAddedToRank(PlayerAddedToRankEvent playerAddedToRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankAddedEvent.of(playerAddedToRankEvent.getPlayer(), playerAddedToRankEvent.getRank()));
}
}

View File

@@ -72,6 +72,7 @@ subprojects {
shade "net.kyori:adventure-text-minimessage:${adventure}"
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
compileOnly 'net.luckperms:api:5.4'
compileOnly("org.projectlombok:lombok:${lombok}")

View File

@@ -1,6 +1,7 @@
**New Features**:
- Paper Support. Currently only available on Modrinth and NightBloom
- Added API's for working with FTB Ranks and LuckPerms groups
**Bug Fixes**:

View File

@@ -2,7 +2,7 @@
version_major=2
version_minor=1
version_patch=2
version_build=0
version_build=1
#Mod
mod_author=HypherionSA
@@ -28,6 +28,7 @@ rpc_sdk=1.0
discord_formatter=2.0.0
# Mod Dependencies
ftb_ranks=1802.1.11-build.71
ftb_essentials=1802.2.2-build.83
fabrictailor=1.9.0+1.18.2
vanish=1.1.0

View File

@@ -2,6 +2,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
}
shadowJar {

View File

@@ -0,0 +1,56 @@
// @excludeplugin
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.compat.ftbranks.BridgedRank;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import com.mojang.authlib.GameProfile;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.Getter;
public class FTBRankEvents {
@Getter
public static class RankAddedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankAddedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankAddedEvent of(GameProfile profile, Rank rank) {
return new RankAddedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankRemovedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankRemovedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankRemovedEvent of(GameProfile profile, Rank rank) {
return new RankRemovedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankDeletedEvent extends CraterEvent {
private final BridgedRank rank;
private RankDeletedEvent(BridgedRank rank) {
this.rank = rank;
}
public static RankDeletedEvent of(Rank rank) {
return new RankDeletedEvent(BridgedRank.of(rank));
}
}
}

View File

@@ -0,0 +1,32 @@
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import lombok.RequiredArgsConstructor;
import java.util.UUID;
public class LuckPermsCompatEvents {
@RequiredArgsConstructor(staticName = "of")
public static class GroupAddedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
@RequiredArgsConstructor(staticName = "of")
public static class GroupRemovedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
}

View File

@@ -1,20 +1,102 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.api.events.compat.LuckPermsCompatEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider;
import net.luckperms.api.event.EventBus;
import net.luckperms.api.event.node.NodeMutateEvent;
import net.luckperms.api.model.group.Group;
import net.luckperms.api.model.user.User;
import net.luckperms.api.node.NodeType;
import net.luckperms.api.node.types.InheritanceNode;
import net.minecraft.server.level.ServerPlayer;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
public class LuckPermsCompat {
public static final LuckPermsCompat INSTANCE = new LuckPermsCompat();
private final LuckPerms luckPerms = LuckPermsProvider.get();
LuckPermsCompat() {}
LuckPermsCompat() {
EventBus bus = luckPerms.getEventBus();
bus.subscribe(NodeMutateEvent.class, e -> {
if (!e.isUser())
return;
User user = (User) e.getTarget();
Set<InheritanceNode> addedInheritance = e.getDataAfter().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataBefore().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
Set<InheritanceNode> removedInheritance = e.getDataBefore().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataAfter().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
if(addedInheritance.isEmpty() && removedInheritance.isEmpty()) return;
addedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupAddedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
removedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupRemovedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
});
}
public boolean hasPermission(ServerPlayer player, String perm) {
User luckPermsUser = luckPerms.getPlayerAdapter(ServerPlayer.class).getUser(player);
return luckPermsUser.getCachedData().getPermissionData().checkPermission(perm).asBoolean();
}
public boolean hasGroup(UUID uuid, String group) {
return getUserGroups(uuid).stream().anyMatch(g -> g.equalsIgnoreCase(group));
}
public Set<String> getUserGroups(UUID uuid) {
User user = luckPerms.getUserManager().getUser(uuid);
if (user == null)
return new HashSet<>();
return user.getNodes(NodeType.INHERITANCE).stream().map(InheritanceNode::getGroupName).collect(Collectors.toSet());
}
public boolean addGroupToUser(UUID uuid, String group) {
AtomicBoolean added = new AtomicBoolean(false);
Group g = luckPerms.getGroupManager().getGroup(group);
if (g == null) {
return false;
}
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().add(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
added.set(true);
});
return added.get();
}
public boolean removeGroupFromUser(UUID uuid, String group) {
AtomicBoolean removed = new AtomicBoolean(false);
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().remove(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
removed.set(true);
});
return removed.get();
}
}

View File

@@ -0,0 +1,24 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(staticName = "of")
public class BridgedRank {
private final Rank internal;
public String name() {
return internal.getName();
}
public String id() {
return internal.getId();
}
public Rank toFtb() {
return internal;
}
}

View File

@@ -0,0 +1,83 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import com.hypherionmc.craterlib.api.events.compat.FTBRankEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import dev.ftb.mods.ftbranks.api.FTBRanksAPI;
import dev.ftb.mods.ftbranks.api.event.PlayerAddedToRankEvent;
import dev.ftb.mods.ftbranks.api.event.PlayerRemovedFromRankEvent;
import dev.ftb.mods.ftbranks.api.event.RankDeletedEvent;
import dev.ftb.mods.ftbranks.api.event.RankEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
public class FTBRanks {
public static final FTBRanks INSTANCE = new FTBRanks();
private FTBRanks() {
registerEvents();
}
public List<BridgedRank> getPlayerRanks(BridgedGameProfile profile) {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.INSTANCE.getManager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
return ranks;
}
public List<BridgedRank> getAllRanks() {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.INSTANCE.getManager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
return ranks;
}
public boolean hasRank(BridgedGameProfile profile, String rank) {
return getPlayerRanks(profile).stream().anyMatch(r -> r.toFtb().getName().equalsIgnoreCase(rank) || r.toFtb().getId().equalsIgnoreCase(rank));
}
public boolean addRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didAddRank = new AtomicBoolean(false);
FTBRanksAPI.INSTANCE.getManager().getRank(rank).ifPresent(r -> {
r.add(profile.toMojang());
didAddRank.set(true);
});
return didAddRank.get();
}
public boolean removeRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didRemoveRank = new AtomicBoolean(false);
FTBRanksAPI.INSTANCE.getManager().getRank(rank).ifPresent(r -> {
r.remove(profile.toMojang());
didRemoveRank.set(true);
});
return didRemoveRank.get();
}
public void registerEvents() {
RankEvent.ADD_PLAYER.register(this::playerAddedToRank);
RankEvent.REMOVE_PLAYER.register(this::playerRemovedFromRank);
RankEvent.DELETED.register(this::rankDeleted);
}
private void rankDeleted(RankDeletedEvent rankDeletedEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankDeletedEvent.of(rankDeletedEvent.getRank()));
}
private void playerRemovedFromRank(PlayerRemovedFromRankEvent playerRemovedFromRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankRemovedEvent.of(playerRemovedFromRankEvent.getPlayer(), playerRemovedFromRankEvent.getRank()));
}
private void playerAddedToRank(PlayerAddedToRankEvent playerAddedToRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankAddedEvent.of(playerAddedToRankEvent.getPlayer(), playerAddedToRankEvent.getRank()));
}
}

View File

@@ -10,6 +10,7 @@ dependencies {
}
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"

View File

@@ -6,6 +6,8 @@ dependencies {
modImplementation("maven.modrinth:vanishmod:${vanishmod}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
// Do not edit or remove
implementation project(":Common")
}

View File

@@ -1,6 +1,7 @@
**New Features**:
- Paper Support. Currently only available on Modrinth and NightBloom
- Added API's for working with FTB Ranks and LuckPerms groups
**Bug Fixes**:

View File

@@ -2,7 +2,7 @@
version_major=2
version_minor=1
version_patch=2
version_build=0
version_build=1
#Mod
mod_author=HypherionSA
@@ -28,6 +28,7 @@ rpc_sdk=1.0
discord_formatter=2.0.0
# Mod Dependencies
ftb_ranks=1902.1.16-build.114
ftb_essentials=1902.3.5-build.135
fabrictailor=2.0.1
vanish=1.3.2

View File

@@ -2,6 +2,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
}
shadowJar {

View File

@@ -0,0 +1,56 @@
// @excludeplugin
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.compat.ftbranks.BridgedRank;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import com.mojang.authlib.GameProfile;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.Getter;
public class FTBRankEvents {
@Getter
public static class RankAddedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankAddedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankAddedEvent of(GameProfile profile, Rank rank) {
return new RankAddedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankRemovedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankRemovedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankRemovedEvent of(GameProfile profile, Rank rank) {
return new RankRemovedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankDeletedEvent extends CraterEvent {
private final BridgedRank rank;
private RankDeletedEvent(BridgedRank rank) {
this.rank = rank;
}
public static RankDeletedEvent of(Rank rank) {
return new RankDeletedEvent(BridgedRank.of(rank));
}
}
}

View File

@@ -0,0 +1,32 @@
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import lombok.RequiredArgsConstructor;
import java.util.UUID;
public class LuckPermsCompatEvents {
@RequiredArgsConstructor(staticName = "of")
public static class GroupAddedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
@RequiredArgsConstructor(staticName = "of")
public static class GroupRemovedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
}

View File

@@ -1,20 +1,102 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.api.events.compat.LuckPermsCompatEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider;
import net.luckperms.api.event.EventBus;
import net.luckperms.api.event.node.NodeMutateEvent;
import net.luckperms.api.model.group.Group;
import net.luckperms.api.model.user.User;
import net.luckperms.api.node.NodeType;
import net.luckperms.api.node.types.InheritanceNode;
import net.minecraft.server.level.ServerPlayer;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
public class LuckPermsCompat {
public static final LuckPermsCompat INSTANCE = new LuckPermsCompat();
private final LuckPerms luckPerms = LuckPermsProvider.get();
LuckPermsCompat() {}
LuckPermsCompat() {
EventBus bus = luckPerms.getEventBus();
bus.subscribe(NodeMutateEvent.class, e -> {
if (!e.isUser())
return;
User user = (User) e.getTarget();
Set<InheritanceNode> addedInheritance = e.getDataAfter().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataBefore().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
Set<InheritanceNode> removedInheritance = e.getDataBefore().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataAfter().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
if(addedInheritance.isEmpty() && removedInheritance.isEmpty()) return;
addedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupAddedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
removedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupRemovedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
});
}
public boolean hasPermission(ServerPlayer player, String perm) {
User luckPermsUser = luckPerms.getPlayerAdapter(ServerPlayer.class).getUser(player);
return luckPermsUser.getCachedData().getPermissionData().checkPermission(perm).asBoolean();
}
public boolean hasGroup(UUID uuid, String group) {
return getUserGroups(uuid).stream().anyMatch(g -> g.equalsIgnoreCase(group));
}
public Set<String> getUserGroups(UUID uuid) {
User user = luckPerms.getUserManager().getUser(uuid);
if (user == null)
return new HashSet<>();
return user.getNodes(NodeType.INHERITANCE).stream().map(InheritanceNode::getGroupName).collect(Collectors.toSet());
}
public boolean addGroupToUser(UUID uuid, String group) {
AtomicBoolean added = new AtomicBoolean(false);
Group g = luckPerms.getGroupManager().getGroup(group);
if (g == null) {
return false;
}
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().add(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
added.set(true);
});
return added.get();
}
public boolean removeGroupFromUser(UUID uuid, String group) {
AtomicBoolean removed = new AtomicBoolean(false);
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().remove(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
removed.set(true);
});
return removed.get();
}
}

View File

@@ -0,0 +1,24 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(staticName = "of")
public class BridgedRank {
private final Rank internal;
public String name() {
return internal.getName();
}
public String id() {
return internal.getId();
}
public Rank toFtb() {
return internal;
}
}

View File

@@ -0,0 +1,83 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import com.hypherionmc.craterlib.api.events.compat.FTBRankEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import dev.ftb.mods.ftbranks.api.FTBRanksAPI;
import dev.ftb.mods.ftbranks.api.event.PlayerAddedToRankEvent;
import dev.ftb.mods.ftbranks.api.event.PlayerRemovedFromRankEvent;
import dev.ftb.mods.ftbranks.api.event.RankDeletedEvent;
import dev.ftb.mods.ftbranks.api.event.RankEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
public class FTBRanks {
public static final FTBRanks INSTANCE = new FTBRanks();
private FTBRanks() {
registerEvents();
}
public List<BridgedRank> getPlayerRanks(BridgedGameProfile profile) {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.manager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
return ranks;
}
public List<BridgedRank> getAllRanks() {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.manager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
return ranks;
}
public boolean hasRank(BridgedGameProfile profile, String rank) {
return getPlayerRanks(profile).stream().anyMatch(r -> r.toFtb().getName().equalsIgnoreCase(rank) || r.toFtb().getId().equalsIgnoreCase(rank));
}
public boolean addRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didAddRank = new AtomicBoolean(false);
FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
r.add(profile.toMojang());
didAddRank.set(true);
});
return didAddRank.get();
}
public boolean removeRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didRemoveRank = new AtomicBoolean(false);
FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
r.remove(profile.toMojang());
didRemoveRank.set(true);
});
return didRemoveRank.get();
}
public void registerEvents() {
RankEvent.ADD_PLAYER.register(this::playerAddedToRank);
RankEvent.REMOVE_PLAYER.register(this::playerRemovedFromRank);
RankEvent.DELETED.register(this::rankDeleted);
}
private void rankDeleted(RankDeletedEvent rankDeletedEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankDeletedEvent.of(rankDeletedEvent.getRank()));
}
private void playerRemovedFromRank(PlayerRemovedFromRankEvent playerRemovedFromRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankRemovedEvent.of(playerRemovedFromRankEvent.getPlayer(), playerRemovedFromRankEvent.getRank()));
}
private void playerAddedToRank(PlayerAddedToRankEvent playerAddedToRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankAddedEvent.of(playerAddedToRankEvent.getPlayer(), playerAddedToRankEvent.getRank()));
}
}

View File

@@ -10,6 +10,7 @@ dependencies {
}
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"

View File

@@ -6,6 +6,7 @@ dependencies {
modImplementation("maven.modrinth:vanishmod:${vanishmod}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
// Do not edit or remove
implementation project(":Common")

View File

@@ -1,6 +1,7 @@
**New Features**:
- Paper Support. Currently only available on Modrinth and NightBloom
- Added API's for working with FTB Ranks and LuckPerms groups
**Bug Fixes**:

View File

@@ -2,7 +2,7 @@
version_major=2
version_minor=1
version_patch=2
version_build=0
version_build=1
#Mod
mod_author=HypherionSA
@@ -28,6 +28,7 @@ rpc_sdk=1.0
discord_formatter=2.0.0
# Mod Dependencies
ftb_ranks=1904.1.1-build.82
ftb_essentials=1904.1.0-build.81-SNAPSHOT
fabrictailor=2.0.2
vanish=1.4.0+1.19.3

View File

@@ -2,6 +2,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
}
shadowJar {

View File

@@ -0,0 +1,56 @@
// @excludeplugin
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.compat.ftbranks.BridgedRank;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import com.mojang.authlib.GameProfile;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.Getter;
public class FTBRankEvents {
@Getter
public static class RankAddedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankAddedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankAddedEvent of(GameProfile profile, Rank rank) {
return new RankAddedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankRemovedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankRemovedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankRemovedEvent of(GameProfile profile, Rank rank) {
return new RankRemovedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankDeletedEvent extends CraterEvent {
private final BridgedRank rank;
private RankDeletedEvent(BridgedRank rank) {
this.rank = rank;
}
public static RankDeletedEvent of(Rank rank) {
return new RankDeletedEvent(BridgedRank.of(rank));
}
}
}

View File

@@ -0,0 +1,32 @@
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import lombok.RequiredArgsConstructor;
import java.util.UUID;
public class LuckPermsCompatEvents {
@RequiredArgsConstructor(staticName = "of")
public static class GroupAddedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
@RequiredArgsConstructor(staticName = "of")
public static class GroupRemovedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
}

View File

@@ -1,20 +1,102 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.api.events.compat.LuckPermsCompatEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider;
import net.luckperms.api.event.EventBus;
import net.luckperms.api.event.node.NodeMutateEvent;
import net.luckperms.api.model.group.Group;
import net.luckperms.api.model.user.User;
import net.luckperms.api.node.NodeType;
import net.luckperms.api.node.types.InheritanceNode;
import net.minecraft.server.level.ServerPlayer;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
public class LuckPermsCompat {
public static final LuckPermsCompat INSTANCE = new LuckPermsCompat();
private final LuckPerms luckPerms = LuckPermsProvider.get();
LuckPermsCompat() {}
LuckPermsCompat() {
EventBus bus = luckPerms.getEventBus();
bus.subscribe(NodeMutateEvent.class, e -> {
if (!e.isUser())
return;
User user = (User) e.getTarget();
Set<InheritanceNode> addedInheritance = e.getDataAfter().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataBefore().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
Set<InheritanceNode> removedInheritance = e.getDataBefore().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataAfter().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
if(addedInheritance.isEmpty() && removedInheritance.isEmpty()) return;
addedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupAddedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
removedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupRemovedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
});
}
public boolean hasPermission(ServerPlayer player, String perm) {
User luckPermsUser = luckPerms.getPlayerAdapter(ServerPlayer.class).getUser(player);
return luckPermsUser.getCachedData().getPermissionData().checkPermission(perm).asBoolean();
}
public boolean hasGroup(UUID uuid, String group) {
return getUserGroups(uuid).stream().anyMatch(g -> g.equalsIgnoreCase(group));
}
public Set<String> getUserGroups(UUID uuid) {
User user = luckPerms.getUserManager().getUser(uuid);
if (user == null)
return new HashSet<>();
return user.getNodes(NodeType.INHERITANCE).stream().map(InheritanceNode::getGroupName).collect(Collectors.toSet());
}
public boolean addGroupToUser(UUID uuid, String group) {
AtomicBoolean added = new AtomicBoolean(false);
Group g = luckPerms.getGroupManager().getGroup(group);
if (g == null) {
return false;
}
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().add(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
added.set(true);
});
return added.get();
}
public boolean removeGroupFromUser(UUID uuid, String group) {
AtomicBoolean removed = new AtomicBoolean(false);
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().remove(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
removed.set(true);
});
return removed.get();
}
}

View File

@@ -0,0 +1,24 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(staticName = "of")
public class BridgedRank {
private final Rank internal;
public String name() {
return internal.getName();
}
public String id() {
return internal.getId();
}
public Rank toFtb() {
return internal;
}
}

View File

@@ -0,0 +1,83 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import com.hypherionmc.craterlib.api.events.compat.FTBRankEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import dev.ftb.mods.ftbranks.api.FTBRanksAPI;
import dev.ftb.mods.ftbranks.api.event.PlayerAddedToRankEvent;
import dev.ftb.mods.ftbranks.api.event.PlayerRemovedFromRankEvent;
import dev.ftb.mods.ftbranks.api.event.RankDeletedEvent;
import dev.ftb.mods.ftbranks.api.event.RankEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
public class FTBRanks {
public static final FTBRanks INSTANCE = new FTBRanks();
private FTBRanks() {
registerEvents();
}
public List<BridgedRank> getPlayerRanks(BridgedGameProfile profile) {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.manager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
return ranks;
}
public List<BridgedRank> getAllRanks() {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.manager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
return ranks;
}
public boolean hasRank(BridgedGameProfile profile, String rank) {
return getPlayerRanks(profile).stream().anyMatch(r -> r.toFtb().getName().equalsIgnoreCase(rank) || r.toFtb().getId().equalsIgnoreCase(rank));
}
public boolean addRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didAddRank = new AtomicBoolean(false);
FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
r.add(profile.toMojang());
didAddRank.set(true);
});
return didAddRank.get();
}
public boolean removeRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didRemoveRank = new AtomicBoolean(false);
FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
r.remove(profile.toMojang());
didRemoveRank.set(true);
});
return didRemoveRank.get();
}
public void registerEvents() {
RankEvent.ADD_PLAYER.register(this::playerAddedToRank);
RankEvent.REMOVE_PLAYER.register(this::playerRemovedFromRank);
RankEvent.DELETED.register(this::rankDeleted);
}
private void rankDeleted(RankDeletedEvent rankDeletedEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankDeletedEvent.of(rankDeletedEvent.getRank()));
}
private void playerRemovedFromRank(PlayerRemovedFromRankEvent playerRemovedFromRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankRemovedEvent.of(playerRemovedFromRankEvent.getPlayer(), playerRemovedFromRankEvent.getRank()));
}
private void playerAddedToRank(PlayerAddedToRankEvent playerAddedToRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankAddedEvent.of(playerAddedToRankEvent.getPlayer(), playerAddedToRankEvent.getRank()));
}
}

View File

@@ -10,6 +10,7 @@ dependencies {
}
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"

View File

@@ -6,6 +6,7 @@ dependencies {
modImplementation("maven.modrinth:vanishmod:${vanishmod}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
// Do not edit or remove
implementation project(":Common")

View File

@@ -1,6 +1,7 @@
**New Features**:
- Paper Support. Currently only available on Modrinth and NightBloom
- Added API's for working with FTB Ranks and LuckPerms groups
**Bug Fixes**:

View File

@@ -2,7 +2,7 @@
version_major=2
version_minor=1
version_patch=2
version_build=0
version_build=1
#Mod
mod_author=HypherionSA
@@ -28,6 +28,7 @@ rpc_sdk=1.0
discord_formatter=2.0.0
# Mod Dependencies
ftb_ranks=2001.1.3
ftb_essentials=2001.2.2
fabrictailor=2.2.1
vanish=1.5.0+1.20.2

View File

@@ -2,6 +2,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
}
shadowJar {

View File

@@ -0,0 +1,56 @@
// @excludeplugin
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.compat.ftbranks.BridgedRank;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import com.mojang.authlib.GameProfile;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.Getter;
public class FTBRankEvents {
@Getter
public static class RankAddedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankAddedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankAddedEvent of(GameProfile profile, Rank rank) {
return new RankAddedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankRemovedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankRemovedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankRemovedEvent of(GameProfile profile, Rank rank) {
return new RankRemovedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankDeletedEvent extends CraterEvent {
private final BridgedRank rank;
private RankDeletedEvent(BridgedRank rank) {
this.rank = rank;
}
public static RankDeletedEvent of(Rank rank) {
return new RankDeletedEvent(BridgedRank.of(rank));
}
}
}

View File

@@ -0,0 +1,32 @@
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import lombok.RequiredArgsConstructor;
import java.util.UUID;
public class LuckPermsCompatEvents {
@RequiredArgsConstructor(staticName = "of")
public static class GroupAddedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
@RequiredArgsConstructor(staticName = "of")
public static class GroupRemovedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
}

View File

@@ -1,20 +1,102 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.api.events.compat.LuckPermsCompatEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider;
import net.luckperms.api.event.EventBus;
import net.luckperms.api.event.node.NodeMutateEvent;
import net.luckperms.api.model.group.Group;
import net.luckperms.api.model.user.User;
import net.luckperms.api.node.NodeType;
import net.luckperms.api.node.types.InheritanceNode;
import net.minecraft.server.level.ServerPlayer;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
public class LuckPermsCompat {
public static final LuckPermsCompat INSTANCE = new LuckPermsCompat();
private final LuckPerms luckPerms = LuckPermsProvider.get();
LuckPermsCompat() {}
LuckPermsCompat() {
EventBus bus = luckPerms.getEventBus();
bus.subscribe(NodeMutateEvent.class, e -> {
if (!e.isUser())
return;
User user = (User) e.getTarget();
Set<InheritanceNode> addedInheritance = e.getDataAfter().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataBefore().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
Set<InheritanceNode> removedInheritance = e.getDataBefore().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataAfter().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
if(addedInheritance.isEmpty() && removedInheritance.isEmpty()) return;
addedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupAddedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
removedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupRemovedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
});
}
public boolean hasPermission(ServerPlayer player, String perm) {
User luckPermsUser = luckPerms.getPlayerAdapter(ServerPlayer.class).getUser(player);
return luckPermsUser.getCachedData().getPermissionData().checkPermission(perm).asBoolean();
}
public boolean hasGroup(UUID uuid, String group) {
return getUserGroups(uuid).stream().anyMatch(g -> g.equalsIgnoreCase(group));
}
public Set<String> getUserGroups(UUID uuid) {
User user = luckPerms.getUserManager().getUser(uuid);
if (user == null)
return new HashSet<>();
return user.getNodes(NodeType.INHERITANCE).stream().map(InheritanceNode::getGroupName).collect(Collectors.toSet());
}
public boolean addGroupToUser(UUID uuid, String group) {
AtomicBoolean added = new AtomicBoolean(false);
Group g = luckPerms.getGroupManager().getGroup(group);
if (g == null) {
return false;
}
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().add(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
added.set(true);
});
return added.get();
}
public boolean removeGroupFromUser(UUID uuid, String group) {
AtomicBoolean removed = new AtomicBoolean(false);
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().remove(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
removed.set(true);
});
return removed.get();
}
}

View File

@@ -0,0 +1,24 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(staticName = "of")
public class BridgedRank {
private final Rank internal;
public String name() {
return internal.getName();
}
public String id() {
return internal.getId();
}
public Rank toFtb() {
return internal;
}
}

View File

@@ -0,0 +1,83 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import com.hypherionmc.craterlib.api.events.compat.FTBRankEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import dev.ftb.mods.ftbranks.api.FTBRanksAPI;
import dev.ftb.mods.ftbranks.api.event.PlayerAddedToRankEvent;
import dev.ftb.mods.ftbranks.api.event.PlayerRemovedFromRankEvent;
import dev.ftb.mods.ftbranks.api.event.RankDeletedEvent;
import dev.ftb.mods.ftbranks.api.event.RankEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
public class FTBRanks {
public static final FTBRanks INSTANCE = new FTBRanks();
private FTBRanks() {
registerEvents();
}
public List<BridgedRank> getPlayerRanks(BridgedGameProfile profile) {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.manager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
return ranks;
}
public List<BridgedRank> getAllRanks() {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.manager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
return ranks;
}
public boolean hasRank(BridgedGameProfile profile, String rank) {
return getPlayerRanks(profile).stream().anyMatch(r -> r.toFtb().getName().equalsIgnoreCase(rank) || r.toFtb().getId().equalsIgnoreCase(rank));
}
public boolean addRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didAddRank = new AtomicBoolean(false);
FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
r.add(profile.toMojang());
didAddRank.set(true);
});
return didAddRank.get();
}
public boolean removeRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didRemoveRank = new AtomicBoolean(false);
FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
r.remove(profile.toMojang());
didRemoveRank.set(true);
});
return didRemoveRank.get();
}
public void registerEvents() {
RankEvent.ADD_PLAYER.register(this::playerAddedToRank);
RankEvent.REMOVE_PLAYER.register(this::playerRemovedFromRank);
RankEvent.DELETED.register(this::rankDeleted);
}
private void rankDeleted(RankDeletedEvent rankDeletedEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankDeletedEvent.of(rankDeletedEvent.getRank()));
}
private void playerRemovedFromRank(PlayerRemovedFromRankEvent playerRemovedFromRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankRemovedEvent.of(playerRemovedFromRankEvent.getPlayer(), playerRemovedFromRankEvent.getRank()));
}
private void playerAddedToRank(PlayerAddedToRankEvent playerAddedToRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankAddedEvent.of(playerAddedToRankEvent.getPlayer(), playerAddedToRankEvent.getRank()));
}
}

View File

@@ -10,6 +10,7 @@ dependencies {
}
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"

View File

@@ -6,6 +6,7 @@ dependencies {
modImplementation("maven.modrinth:vanishmod:${vanishmod}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
// Do not edit or remove
implementation project(":Common")

View File

@@ -1,117 +0,0 @@
archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
dependencies {
// Compat
modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
// Do not edit or remove
implementation project(":Common")
}
shadowJar {
from sourceSets.main.output
configurations = [project.configurations.shade]
dependencies {
exclude(dependency('com.google.code.gson:.*'))
relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig'
relocate 'me.hypherionmc.mcdiscordformatter', 'shadow.hypherionmc.mcdiscordformatter'
relocate 'net.kyori', 'shadow.kyori'
}
setArchiveClassifier('dev-shadow')
mergeServiceFiles()
}
/**
* ===============================================================================
* = DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING =
* ===============================================================================
*/
unimined.minecraft {
neoForged {
loader neoforge_version
mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
}
}
remapJar {
inputFile.set shadowJar.archiveFile
dependsOn shadowJar
archiveClassifier.set null
}
jar {
archiveClassifier.set "dev"
}
processResources {
from project(":Common").sourceSets.main.resources
def buildProps = project.properties.clone()
filesMatching("META-INF/mods.toml") {
expand buildProps
}
}
compileTestJava.enabled = false
tasks.withType(JavaCompile).configureEach {
source(project(":Common").sourceSets.main.allSource)
}
/**
* Publishing Config
*/
publishing {
publications {
mavenJava(MavenPublication) {
artifactId project.archivesBaseName
from components.java
artifact(remapJar) {
builtBy remapJar
}
pom.withXml {
Node pomNode = asNode()
pomNode.dependencies.'*'.findAll() {
it.artifactId.text() == 'regutils-joined-fabric' ||
it.artifactId.text() == 'core' ||
it.artifactId.text() == 'toml'
}.each() {
it.parent().remove(it)
}
}
}
}
repositories {
maven rootProject.orion.getPublishingMaven()
}
}
publisher {
apiKeys {
modrinth(System.getenv("MODRINTH_TOKEN"))
curseforge(System.getenv("CURSE_TOKEN"))
nightbloom(System.getenv("PLATFORM_KEY"))
}
setCurseID(curse_id)
setModrinthID(modrinth_id)
setNightbloomID("craterlib")
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")
setDisplayName("[NeoForge 1.20.4] CraterLib - ${project.version}")
setGameVersions("1.20.4")
setLoaders("neoforge")
setArtifact(remapJar)
setCurseEnvironment("both")
setIsManualRelease(true)
}

View File

@@ -1,44 +0,0 @@
package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
import com.hypherionmc.craterlib.common.NeoForgeServerEvents;
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.PacketRegistry;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
import com.hypherionmc.craterlib.network.CraterNeoForgeNetworkHandler;
import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
import com.hypherionmc.craterlib.nojang.client.BridgedOptions;
import net.minecraft.client.Minecraft;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.common.Mod;
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
import net.neoforged.fml.loading.FMLEnvironment;
import net.neoforged.fml.loading.FMLLoader;
import net.neoforged.neoforge.common.NeoForge;
@Mod(CraterConstants.MOD_ID)
public class CraterLib {
private final PacketRegistry handler;
public CraterLib(IEventBus eventBus) {
NeoForge.EVENT_BUS.register(new NeoForgeServerEvents());
eventBus.addListener(this::commonSetup);
handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER);
if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) {
NeoForge.EVENT_BUS.register(new Vanish());
}
}
public void commonSetup(FMLCommonSetupEvent evt) {
new CraterPacketNetwork(handler);
if (FMLEnvironment.dist.isClient()) {
LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
CraterEventBus.INSTANCE.postEvent(event);
}
}
}

View File

@@ -1,25 +0,0 @@
package com.hypherionmc.craterlib.client;
import com.hypherionmc.craterlib.CraterConstants;
import com.hypherionmc.craterlib.api.events.client.CraterClientTickEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
import net.minecraft.client.Minecraft;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.Mod;
import net.neoforged.neoforge.event.TickEvent;
@Mod.EventBusSubscriber(modid = CraterConstants.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
public class NeoForgeClientEvents {
@SubscribeEvent
public static void clientTick(TickEvent.LevelTickEvent event) {
if (Minecraft.getInstance().level == null)
return;
CraterClientTickEvent craterClientTickEvent = new CraterClientTickEvent(BridgedClientLevel.of(Minecraft.getInstance().level));
CraterEventBus.INSTANCE.postEvent(craterClientTickEvent);
}
}

View File

@@ -1,40 +0,0 @@
package com.hypherionmc.craterlib.client;
import com.hypherionmc.craterlib.core.platform.ClientPlatform;
import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import net.minecraft.client.Minecraft;
import net.minecraft.network.Connection;
import java.util.Objects;
/**
* @author HypherionSA
*/
public class NeoForgeClientHelper implements ClientPlatform {
public NeoForgeClientHelper() {
}
@Override
public BridgedMinecraft getClientInstance() {
return new BridgedMinecraft();
}
@Override
public BridgedPlayer getClientPlayer() {
return BridgedPlayer.of(Minecraft.getInstance().player);
}
@Override
public BridgedClientLevel getClientLevel() {
return BridgedClientLevel.of(Minecraft.getInstance().level);
}
@Override
public Connection getClientConnection() {
Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
return Minecraft.getInstance().getConnection().getConnection();
}
}

View File

@@ -1,19 +0,0 @@
package com.hypherionmc.craterlib.common;
import com.hypherionmc.craterlib.core.platform.CommonPlatform;
import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
import net.neoforged.neoforge.server.ServerLifecycleHooks;
/**
* @author HypherionSA
*/
public class NeoForgeCommonHelper implements CommonPlatform {
public NeoForgeCommonHelper() {
}
@Override
public BridgedMinecraftServer getMCServer() {
return BridgedMinecraftServer.of(ServerLifecycleHooks.getCurrentServer());
}
}

View File

@@ -1,22 +0,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;
public class NeoForgeCompatHelper implements CompatUtils {
@Override
public boolean isPlayerActive(BridgedPlayer player) {
if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
return true;
return !VanishUtil.isVanished(player.toMojangServerPlayer());
}
@Override
public String getSkinUUID(BridgedPlayer player) {
return player.getStringUUID();
}
}

View File

@@ -1,79 +0,0 @@
package com.hypherionmc.craterlib.common;
import com.hypherionmc.craterlib.core.platform.Environment;
import com.hypherionmc.craterlib.core.platform.LoaderType;
import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
import net.minecraft.SharedConstants;
import net.minecraft.client.Minecraft;
import net.neoforged.fml.ModList;
import net.neoforged.fml.loading.FMLLoader;
import net.neoforged.fml.loading.FMLPaths;
import java.io.File;
/**
* @author HypherionSA
*/
public class NeoForgeLoaderHelper implements ModloaderEnvironment {
public NeoForgeLoaderHelper() {
}
@Override
public boolean isFabric() {
return false;
}
@Override
public LoaderType getLoaderType() {
return LoaderType.NEOFORGE;
}
@Override
public String getGameVersion() {
return SharedConstants.VERSION_STRING;
}
@Override
public File getGameFolder() {
return Minecraft.getInstance().gameDirectory;
}
@Override
public File getConfigFolder() {
return FMLPaths.CONFIGDIR.get().toFile();
}
@Override
public File getModsFolder() {
return FMLPaths.MODSDIR.get().toFile();
}
@Override
public Environment getEnvironment() {
switch (FMLLoader.getDist()) {
case CLIENT -> {
return Environment.CLIENT;
}
case DEDICATED_SERVER -> {
return Environment.SERVER;
}
}
return Environment.UNKNOWN;
}
@Override
public boolean isModLoaded(String modid) {
return ModList.get().isLoaded(modid);
}
@Override
public boolean isDevEnv() {
return !FMLLoader.isProduction();
}
@Override
public int getModCount() {
return ModList.get().size();
}
}

View File

@@ -1,41 +0,0 @@
package com.hypherionmc.craterlib.common;
import com.hypherionmc.craterlib.api.events.server.CraterRegisterCommandEvent;
import com.hypherionmc.craterlib.api.events.server.CraterServerLifecycleEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.neoforge.event.RegisterCommandsEvent;
import net.neoforged.neoforge.event.server.ServerStartedEvent;
import net.neoforged.neoforge.event.server.ServerStartingEvent;
import net.neoforged.neoforge.event.server.ServerStoppedEvent;
import net.neoforged.neoforge.event.server.ServerStoppingEvent;
public class NeoForgeServerEvents {
@SubscribeEvent
public void serverStarting(ServerStartingEvent event) {
CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Starting(BridgedMinecraftServer.of(event.getServer())));
}
@SubscribeEvent
public void serverStarted(ServerStartedEvent event) {
CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Started(BridgedMinecraftServer.of(event.getServer())));
}
@SubscribeEvent
public void serverStopping(ServerStoppingEvent event) {
CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopping(BridgedMinecraftServer.of(event.getServer())));
}
@SubscribeEvent
public void serverStopped(ServerStoppedEvent event) {
CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopped(BridgedMinecraftServer.of(event.getServer())));
}
@SubscribeEvent
public void onCommandRegister(RegisterCommandsEvent event) {
CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent(event.getDispatcher()));
}
}

View File

@@ -1,24 +0,0 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.api.events.server.CraterPlayerEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import net.neoforged.bus.api.SubscribeEvent;
import redstonedubstep.mods.vanishmod.api.PlayerVanishEvent;
public class Vanish {
public Vanish() {
}
@SubscribeEvent
public void vanishevent(PlayerVanishEvent event) {
if (event.isVanished()) {
CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedOut(BridgedPlayer.of(event.getEntity()), true));
} else {
CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedIn(BridgedPlayer.of(event.getEntity()), true));
}
}
}

View File

@@ -1,44 +0,0 @@
package com.hypherionmc.craterlib.mixin;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.AbstractConfig;
import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.ModuleConfig;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen;
import net.neoforged.neoforge.client.ConfigScreenHandler;
import net.neoforged.neoforgespi.language.IModInfo;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.Optional;
import java.util.function.BiFunction;
/**
* @author HypherionSA
*/
@Mixin(ConfigScreenHandler.class)
public class ConfigScreenHandlerMixin {
/**
* Inject Auto Generated config Screens into forge
*
*/
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
AbstractConfig config = watcher.getLeft();
if (config.getModId().equals(selectedMod.getModId())) {
cir.setReturnValue(
Optional.of((minecraft, screen) -> new CraterConfigScreen(config, screen))
);
}
}
});
}
}

View File

@@ -1,37 +0,0 @@
package com.hypherionmc.craterlib.mixin;
import com.hypherionmc.craterlib.api.events.server.CraterServerChatEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import com.hypherionmc.craterlib.utils.ChatUtils;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.PlayerChatMessage;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.FilteredText;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
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;
@Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
public class ServerGamePacketListenerImplMixin {
@Shadow
public ServerPlayer player;
@Inject(
method = "lambda$handleChat$6",
at = @At("HEAD"),
cancellable = true
)
private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
Component finalcomp = component == null ? arg.decoratedContent() : component;
CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalcomp.getString(), ChatUtils.mojangToAdventure(finalcomp));
CraterEventBus.INSTANCE.postEvent(event);
if (event.wasCancelled())
ci.cancel();
}
}

View File

@@ -1,53 +0,0 @@
package com.hypherionmc.craterlib.mixin;
import com.hypherionmc.craterlib.api.events.server.ServerStatusEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.utils.ChatUtils;
import net.minecraft.network.Connection;
import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket;
import net.minecraft.network.protocol.status.ServerStatus;
import net.minecraft.network.protocol.status.ServerboundStatusRequestPacket;
import net.minecraft.server.network.ServerStatusPacketListenerImpl;
import org.spongepowered.asm.mixin.Final;
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;
@Mixin(ServerStatusPacketListenerImpl.class)
public class ServerStatusPacketListenerMixin {
@Shadow
@Final
private ServerStatus status;
@Shadow @Final private Connection connection;
@Inject(method = "handleStatusRequest",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/network/Connection;send(Lnet/minecraft/network/protocol/Packet;)V",
shift = At.Shift.BEFORE),
cancellable = true
)
private void injectHandleStatusRequest(ServerboundStatusRequestPacket arg, CallbackInfo ci) {
ServerStatusEvent.StatusRequestEvent event = new ServerStatusEvent.StatusRequestEvent(ChatUtils.mojangToAdventure(status.description()));
CraterEventBus.INSTANCE.postEvent(event);
if (event.getNewStatus() != null) {
ci.cancel();
this.connection.send(new ClientboundStatusResponsePacket(
new ServerStatus(ChatUtils.adventureToMojang(
event.getNewStatus()),
status.players(),
status.version(),
status.favicon(),
status.enforcesSecureChat(),
status.isModded()
)
));
}
}
}

View File

@@ -1,116 +0,0 @@
package com.hypherionmc.craterlib.network;
import com.hypherionmc.craterlib.CraterConstants;
import com.hypherionmc.craterlib.core.networking.PacketRegistry;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Player;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.LogicalSide;
import net.neoforged.neoforge.network.PacketDistributor;
import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent;
import net.neoforged.neoforge.network.handling.IPayloadHandler;
import net.neoforged.neoforge.network.registration.IPayloadRegistrar;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public class CraterNeoForgeNetworkHandler extends PacketRegistry {
private final Map<Class<?>, NeoForgePacketContainer> PACKETS = new HashMap<>();
public CraterNeoForgeNetworkHandler(PacketSide side) {
super(side);
}
@SubscribeEvent
public void register(final RegisterPayloadHandlerEvent event) {
if (!PACKETS.isEmpty()) {
PACKETS.forEach((type, container) -> {
final IPayloadRegistrar registrar = event.registrar(container.packetId().getNamespace());
registrar.common(
container.packetId(),
container.decoder(),
container.handler());
});
}
}
protected <T> void registerPacket(PacketHolder<T> container) {
if (PACKETS.get(container.messageType()) == null) {
var packetContainer = new NeoForgePacketContainer<>(
container.messageType(),
container.type().toMojang(),
this.mojangEncoder(container.encoder()),
decoder(this.mojangDecoder(container.decoder())),
buildHandler(container.handler())
);
PACKETS.put(container.messageType(), packetContainer);
}
}
private <T> FriendlyByteBuf.Reader<NeoForgePacket<T>> decoder(Function<FriendlyByteBuf, T> decoder) {
return (buf -> {
T packet = decoder.apply(buf);
return new NeoForgePacket<T>(PACKETS.get(packet.getClass()), packet);
});
}
public <T> void sendToServer(T packet) {
this.sendToServer(packet, false);
}
public <T> void sendToServer(T packet, boolean ignoreCheck) {
NeoForgePacketContainer<T> container = PACKETS.get(packet.getClass());
try {
PacketDistributor.SERVER.noArg().send(new NeoForgePacket<>(container, packet));
} catch (Throwable t) {
CraterConstants.LOG.error("{} packet not registered on the client, this is needed.", packet.getClass(), t);
}
}
public <T> void sendToClient(T packet, BridgedPlayer player) {
NeoForgePacketContainer<T> container = PACKETS.get(packet.getClass());
try {
if (player.getConnection() == null)
return;
if (player.getConnection().isConnected(container.packetId())) {
PacketDistributor.PLAYER.with(player.toMojangServerPlayer()).send(new NeoForgePacket<>(container, packet));
}
} catch (Throwable t) {
CraterConstants.LOG.error("{} packet not registered on the server, this is needed.", packet.getClass(), t);
}
}
private <T, K extends NeoForgePacket<T>> IPayloadHandler<K> buildHandler(Consumer<PacketContext<T>> handler) {
return (payload, ctx) -> {
try {
PacketSide side = ctx.flow().getReceptionSide().equals(LogicalSide.SERVER) ? PacketSide.SERVER : PacketSide.CLIENT;
Player player = ctx.player().orElse(null);
handler.accept(new PacketContext<>(BridgedPlayer.of(player), payload.packet(), side));
} catch (Throwable t) {
CraterConstants.LOG.error("Error handling packet: {} -> ", payload.packet().getClass(), t);
}
};
}
private <T> Function<FriendlyByteBuf, T> mojangDecoder(Function<BridgedFriendlyByteBuf, T> handler) {
return (byteBuf) -> handler.apply(BridgedFriendlyByteBuf.of(byteBuf));
}
private <T> BiConsumer<T, FriendlyByteBuf> mojangEncoder(BiConsumer<T, BridgedFriendlyByteBuf> handler) {
return (t, byteBuf) -> handler.accept(t, BridgedFriendlyByteBuf.of(byteBuf));
}
}

View File

@@ -1,21 +0,0 @@
package com.hypherionmc.craterlib.network;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.ResourceLocation;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public record NeoForgePacket<T>(NeoForgePacketContainer<T> container, T packet) implements CustomPacketPayload {
@Override
public void write(FriendlyByteBuf buff) {
container().encoder().accept(packet(), buff);
}
@Override
public ResourceLocation id() {
return container().packetId();
}
}

View File

@@ -1,16 +0,0 @@
package com.hypherionmc.craterlib.network;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.neoforged.neoforge.network.handling.IPayloadHandler;
import java.util.function.BiConsumer;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public record NeoForgePacketContainer<T>(Class<T> messageType,
ResourceLocation packetId,
BiConsumer<T, FriendlyByteBuf> encoder,
FriendlyByteBuf.Reader<NeoForgePacket<T>> decoder,
IPayloadHandler<NeoForgePacket<T>> handler) { }

View File

@@ -1,33 +0,0 @@
modLoader = "javafml"
loaderVersion = "[1,)"
license = "MIT"
issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
[[mods]]
modId = "${mod_id}"
version = "${version}"
displayName = "${mod_name}"
displayURL = "https://modrinth.com/mod/craterlib"
logoFile = "craterlib_logo.png"
#credits="Thanks for this example mod goes to Java"
authors = "${mod_author}, Zenith"
description = '''
A library mod used by First Dark Development and HypherionSA Mods
'''
displayTest = "NONE"
[[dependencies.${ mod_id }]]
modId = "neoforge"
type="required"
required=true
versionRange = "[20.4,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.${ mod_id }]]
modId = "minecraft"
type="required"
required=true
versionRange = "[1.20.4,1.20.5)"
ordering = "NONE"
side = "BOTH"

View File

@@ -1 +0,0 @@
com.hypherionmc.craterlib.client.NeoForgeClientHelper

View File

@@ -1 +0,0 @@
com.hypherionmc.craterlib.common.NeoForgeCommonHelper

View File

@@ -1 +0,0 @@
com.hypherionmc.craterlib.common.NeoForgeCompatHelper

View File

@@ -1 +0,0 @@
com.hypherionmc.craterlib.common.NeoForgeLoaderHelper

View File

@@ -1,18 +0,0 @@
{
"required": true,
"minVersion": "0.8",
"package": "com.hypherionmc.craterlib.mixin",
"compatibilityLevel": "JAVA_17",
"mixins": [
],
"client": [
"ConfigScreenHandlerMixin"
],
"server": [
"ServerGamePacketListenerImplMixin",
"ServerStatusPacketListenerMixin"
],
"injectors": {
"defaultRequire": 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 0 B

View File

@@ -1,6 +1,7 @@
**New Features**:
- Paper Support. Currently only available on Modrinth and NightBloom
- Added API's for working with FTB Ranks and LuckPerms groups
**Bug Fixes**:

View File

@@ -2,7 +2,7 @@
version_major=2
version_minor=1
version_patch=2
version_build=0
version_build=1
#Mod
mod_author=HypherionSA
@@ -36,6 +36,7 @@ vanish=1.5.4+1.20.4
mod_menu_version=9.2.0-beta.2
vanishmod=1.1.15
vanishmod_neo=puxrKAMr
ftb_ranks=2004.2.0
ftb_essentials=2004.1.3
# Publishing

View File

@@ -2,6 +2,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
}
shadowJar {

View File

@@ -0,0 +1,56 @@
// @excludeplugin
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.compat.ftbranks.BridgedRank;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import com.mojang.authlib.GameProfile;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.Getter;
public class FTBRankEvents {
@Getter
public static class RankAddedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankAddedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankAddedEvent of(GameProfile profile, Rank rank) {
return new RankAddedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankRemovedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankRemovedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankRemovedEvent of(GameProfile profile, Rank rank) {
return new RankRemovedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankDeletedEvent extends CraterEvent {
private final BridgedRank rank;
private RankDeletedEvent(BridgedRank rank) {
this.rank = rank;
}
public static RankDeletedEvent of(Rank rank) {
return new RankDeletedEvent(BridgedRank.of(rank));
}
}
}

View File

@@ -0,0 +1,32 @@
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import lombok.RequiredArgsConstructor;
import java.util.UUID;
public class LuckPermsCompatEvents {
@RequiredArgsConstructor(staticName = "of")
public static class GroupAddedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
@RequiredArgsConstructor(staticName = "of")
public static class GroupRemovedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
}

View File

@@ -1,20 +1,102 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.api.events.compat.LuckPermsCompatEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider;
import net.luckperms.api.event.EventBus;
import net.luckperms.api.event.node.NodeMutateEvent;
import net.luckperms.api.model.group.Group;
import net.luckperms.api.model.user.User;
import net.luckperms.api.node.NodeType;
import net.luckperms.api.node.types.InheritanceNode;
import net.minecraft.server.level.ServerPlayer;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
public class LuckPermsCompat {
public static final LuckPermsCompat INSTANCE = new LuckPermsCompat();
private final LuckPerms luckPerms = LuckPermsProvider.get();
LuckPermsCompat() {}
LuckPermsCompat() {
EventBus bus = luckPerms.getEventBus();
bus.subscribe(NodeMutateEvent.class, e -> {
if (!e.isUser())
return;
User user = (User) e.getTarget();
Set<InheritanceNode> addedInheritance = e.getDataAfter().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataBefore().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
Set<InheritanceNode> removedInheritance = e.getDataBefore().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataAfter().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
if(addedInheritance.isEmpty() && removedInheritance.isEmpty()) return;
addedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupAddedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
removedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupRemovedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
});
}
public boolean hasPermission(ServerPlayer player, String perm) {
User luckPermsUser = luckPerms.getPlayerAdapter(ServerPlayer.class).getUser(player);
return luckPermsUser.getCachedData().getPermissionData().checkPermission(perm).asBoolean();
}
public boolean hasGroup(UUID uuid, String group) {
return getUserGroups(uuid).stream().anyMatch(g -> g.equalsIgnoreCase(group));
}
public Set<String> getUserGroups(UUID uuid) {
User user = luckPerms.getUserManager().getUser(uuid);
if (user == null)
return new HashSet<>();
return user.getNodes(NodeType.INHERITANCE).stream().map(InheritanceNode::getGroupName).collect(Collectors.toSet());
}
public boolean addGroupToUser(UUID uuid, String group) {
AtomicBoolean added = new AtomicBoolean(false);
Group g = luckPerms.getGroupManager().getGroup(group);
if (g == null) {
return false;
}
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().add(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
added.set(true);
});
return added.get();
}
public boolean removeGroupFromUser(UUID uuid, String group) {
AtomicBoolean removed = new AtomicBoolean(false);
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().remove(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
removed.set(true);
});
return removed.get();
}
}

View File

@@ -0,0 +1,24 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(staticName = "of")
public class BridgedRank {
private final Rank internal;
public String name() {
return internal.getName();
}
public String id() {
return internal.getId();
}
public Rank toFtb() {
return internal;
}
}

View File

@@ -0,0 +1,83 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import com.hypherionmc.craterlib.api.events.compat.FTBRankEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import dev.ftb.mods.ftbranks.api.FTBRanksAPI;
import dev.ftb.mods.ftbranks.api.event.PlayerAddedToRankEvent;
import dev.ftb.mods.ftbranks.api.event.PlayerRemovedFromRankEvent;
import dev.ftb.mods.ftbranks.api.event.RankDeletedEvent;
import dev.ftb.mods.ftbranks.api.event.RankEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
public class FTBRanks {
public static final FTBRanks INSTANCE = new FTBRanks();
private FTBRanks() {
registerEvents();
}
public List<BridgedRank> getPlayerRanks(BridgedGameProfile profile) {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.manager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
return ranks;
}
public List<BridgedRank> getAllRanks() {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.manager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
return ranks;
}
public boolean hasRank(BridgedGameProfile profile, String rank) {
return getPlayerRanks(profile).stream().anyMatch(r -> r.toFtb().getName().equalsIgnoreCase(rank) || r.toFtb().getId().equalsIgnoreCase(rank));
}
public boolean addRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didAddRank = new AtomicBoolean(false);
FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
r.add(profile.toMojang());
didAddRank.set(true);
});
return didAddRank.get();
}
public boolean removeRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didRemoveRank = new AtomicBoolean(false);
FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
r.remove(profile.toMojang());
didRemoveRank.set(true);
});
return didRemoveRank.get();
}
public void registerEvents() {
RankEvent.ADD_PLAYER.register(this::playerAddedToRank);
RankEvent.REMOVE_PLAYER.register(this::playerRemovedFromRank);
RankEvent.DELETED.register(this::rankDeleted);
}
private void rankDeleted(RankDeletedEvent rankDeletedEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankDeletedEvent.of(rankDeletedEvent.getRank()));
}
private void playerRemovedFromRank(PlayerRemovedFromRankEvent playerRemovedFromRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankRemovedEvent.of(playerRemovedFromRankEvent.getPlayer(), playerRemovedFromRankEvent.getRank()));
}
private void playerAddedToRank(PlayerAddedToRankEvent playerAddedToRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankAddedEvent.of(playerAddedToRankEvent.getPlayer(), playerAddedToRankEvent.getRank()));
}
}

View File

@@ -10,6 +10,7 @@ dependencies {
}
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"

View File

@@ -6,6 +6,7 @@ dependencies {
modImplementation("maven.modrinth:vanishmod:${vanishmod}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
// Do not edit or remove
implementation project(":Common")

View File

@@ -1,6 +1,7 @@
**New Features**:
- Paper Support. Currently only available on Modrinth and NightBloom
- Added API's for working with FTB Ranks and LuckPerms groups
**Bug Fixes**:

View File

@@ -2,7 +2,7 @@
version_major=2
version_minor=1
version_patch=2
version_build=0
version_build=1
#Mod
mod_author=HypherionSA
@@ -28,6 +28,7 @@ rpc_sdk=1.0
discord_formatter=2.0.0
# Mod Dependencies
ftb_ranks=2001.1.3
ftb_essentials=2001.2.2
fabrictailor=2.2.1
vanish=1.5.4+1.20.1

View File

@@ -2,6 +2,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
}
shadowJar {

View File

@@ -0,0 +1,56 @@
// @excludeplugin
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.compat.ftbranks.BridgedRank;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import com.mojang.authlib.GameProfile;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.Getter;
public class FTBRankEvents {
@Getter
public static class RankAddedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankAddedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankAddedEvent of(GameProfile profile, Rank rank) {
return new RankAddedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankRemovedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankRemovedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankRemovedEvent of(GameProfile profile, Rank rank) {
return new RankRemovedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankDeletedEvent extends CraterEvent {
private final BridgedRank rank;
private RankDeletedEvent(BridgedRank rank) {
this.rank = rank;
}
public static RankDeletedEvent of(Rank rank) {
return new RankDeletedEvent(BridgedRank.of(rank));
}
}
}

View File

@@ -0,0 +1,32 @@
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import lombok.RequiredArgsConstructor;
import java.util.UUID;
public class LuckPermsCompatEvents {
@RequiredArgsConstructor(staticName = "of")
public static class GroupAddedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
@RequiredArgsConstructor(staticName = "of")
public static class GroupRemovedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
}

View File

@@ -1,20 +1,102 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.api.events.compat.LuckPermsCompatEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider;
import net.luckperms.api.event.EventBus;
import net.luckperms.api.event.node.NodeMutateEvent;
import net.luckperms.api.model.group.Group;
import net.luckperms.api.model.user.User;
import net.luckperms.api.node.NodeType;
import net.luckperms.api.node.types.InheritanceNode;
import net.minecraft.server.level.ServerPlayer;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
public class LuckPermsCompat {
public static final LuckPermsCompat INSTANCE = new LuckPermsCompat();
private final LuckPerms luckPerms = LuckPermsProvider.get();
LuckPermsCompat() {}
LuckPermsCompat() {
EventBus bus = luckPerms.getEventBus();
bus.subscribe(NodeMutateEvent.class, e -> {
if (!e.isUser())
return;
User user = (User) e.getTarget();
Set<InheritanceNode> addedInheritance = e.getDataAfter().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataBefore().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
Set<InheritanceNode> removedInheritance = e.getDataBefore().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataAfter().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
if(addedInheritance.isEmpty() && removedInheritance.isEmpty()) return;
addedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupAddedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
removedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupRemovedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
});
}
public boolean hasPermission(ServerPlayer player, String perm) {
User luckPermsUser = luckPerms.getPlayerAdapter(ServerPlayer.class).getUser(player);
return luckPermsUser.getCachedData().getPermissionData().checkPermission(perm).asBoolean();
}
public boolean hasGroup(UUID uuid, String group) {
return getUserGroups(uuid).stream().anyMatch(g -> g.equalsIgnoreCase(group));
}
public Set<String> getUserGroups(UUID uuid) {
User user = luckPerms.getUserManager().getUser(uuid);
if (user == null)
return new HashSet<>();
return user.getNodes(NodeType.INHERITANCE).stream().map(InheritanceNode::getGroupName).collect(Collectors.toSet());
}
public boolean addGroupToUser(UUID uuid, String group) {
AtomicBoolean added = new AtomicBoolean(false);
Group g = luckPerms.getGroupManager().getGroup(group);
if (g == null) {
return false;
}
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().add(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
added.set(true);
});
return added.get();
}
public boolean removeGroupFromUser(UUID uuid, String group) {
AtomicBoolean removed = new AtomicBoolean(false);
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().remove(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
removed.set(true);
});
return removed.get();
}
}

View File

@@ -0,0 +1,24 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(staticName = "of")
public class BridgedRank {
private final Rank internal;
public String name() {
return internal.getName();
}
public String id() {
return internal.getId();
}
public Rank toFtb() {
return internal;
}
}

View File

@@ -0,0 +1,83 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import com.hypherionmc.craterlib.api.events.compat.FTBRankEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import dev.ftb.mods.ftbranks.api.FTBRanksAPI;
import dev.ftb.mods.ftbranks.api.event.PlayerAddedToRankEvent;
import dev.ftb.mods.ftbranks.api.event.PlayerRemovedFromRankEvent;
import dev.ftb.mods.ftbranks.api.event.RankDeletedEvent;
import dev.ftb.mods.ftbranks.api.event.RankEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
public class FTBRanks {
public static final FTBRanks INSTANCE = new FTBRanks();
private FTBRanks() {
registerEvents();
}
public List<BridgedRank> getPlayerRanks(BridgedGameProfile profile) {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.manager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
return ranks;
}
public List<BridgedRank> getAllRanks() {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.manager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
return ranks;
}
public boolean hasRank(BridgedGameProfile profile, String rank) {
return getPlayerRanks(profile).stream().anyMatch(r -> r.toFtb().getName().equalsIgnoreCase(rank) || r.toFtb().getId().equalsIgnoreCase(rank));
}
public boolean addRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didAddRank = new AtomicBoolean(false);
FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
r.add(profile.toMojang());
didAddRank.set(true);
});
return didAddRank.get();
}
public boolean removeRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didRemoveRank = new AtomicBoolean(false);
FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
r.remove(profile.toMojang());
didRemoveRank.set(true);
});
return didRemoveRank.get();
}
public void registerEvents() {
RankEvent.ADD_PLAYER.register(this::playerAddedToRank);
RankEvent.REMOVE_PLAYER.register(this::playerRemovedFromRank);
RankEvent.DELETED.register(this::rankDeleted);
}
private void rankDeleted(RankDeletedEvent rankDeletedEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankDeletedEvent.of(rankDeletedEvent.getRank()));
}
private void playerRemovedFromRank(PlayerRemovedFromRankEvent playerRemovedFromRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankRemovedEvent.of(playerRemovedFromRankEvent.getPlayer(), playerRemovedFromRankEvent.getRank()));
}
private void playerAddedToRank(PlayerAddedToRankEvent playerAddedToRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankAddedEvent.of(playerAddedToRankEvent.getPlayer(), playerAddedToRankEvent.getRank()));
}
}

View File

@@ -10,6 +10,7 @@ dependencies {
}
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@@ -5,6 +5,7 @@ dependencies {
modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks-neoforge:${ftb_ranks}")
// Do not edit or remove
implementation project(":Common")

View File

@@ -1,6 +1,7 @@
**New Features**:
- Paper Support. Currently only available on Modrinth and NightBloom
- Added API's for working with FTB Ranks and LuckPerms groups
**Bug Fixes**:

View File

@@ -2,7 +2,7 @@
version_major=2
version_minor=1
version_patch=2
version_build=0
version_build=1
#Mod
mod_author=HypherionSA
@@ -37,6 +37,7 @@ mod_menu_version=10.0.0-beta.1
vanishmod=1.1.12.1
vanishmod_neo=puxrKAMr
ftb_essentials=2101.1.0
ftb_ranks=2101.1.1
# Publishing
curse_id=867099

View File

@@ -2,6 +2,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
}
shadowJar {

View File

@@ -0,0 +1,56 @@
// @excludeplugin
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.compat.ftbranks.BridgedRank;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import com.mojang.authlib.GameProfile;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.Getter;
public class FTBRankEvents {
@Getter
public static class RankAddedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankAddedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankAddedEvent of(GameProfile profile, Rank rank) {
return new RankAddedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankRemovedEvent extends CraterEvent {
private final BridgedGameProfile gameProfile;
private final BridgedRank rank;
private RankRemovedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
this.gameProfile = gameProfile;
this.rank = rank;
}
public static RankRemovedEvent of(GameProfile profile, Rank rank) {
return new RankRemovedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
}
}
@Getter
public static class RankDeletedEvent extends CraterEvent {
private final BridgedRank rank;
private RankDeletedEvent(BridgedRank rank) {
this.rank = rank;
}
public static RankDeletedEvent of(Rank rank) {
return new RankDeletedEvent(BridgedRank.of(rank));
}
}
}

View File

@@ -0,0 +1,32 @@
package com.hypherionmc.craterlib.api.events.compat;
import com.hypherionmc.craterlib.core.event.CraterEvent;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import lombok.RequiredArgsConstructor;
import java.util.UUID;
public class LuckPermsCompatEvents {
@RequiredArgsConstructor(staticName = "of")
public static class GroupAddedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
@RequiredArgsConstructor(staticName = "of")
public static class GroupRemovedEvent extends CraterEvent {
private final String identifier;
private final UUID uuid;
private final String username;
public BridgedGameProfile toProfile() {
return BridgedGameProfile.mojang(uuid, username);
}
}
}

View File

@@ -1,20 +1,102 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.api.events.compat.LuckPermsCompatEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider;
import net.luckperms.api.event.EventBus;
import net.luckperms.api.event.node.NodeMutateEvent;
import net.luckperms.api.model.group.Group;
import net.luckperms.api.model.user.User;
import net.luckperms.api.node.NodeType;
import net.luckperms.api.node.types.InheritanceNode;
import net.minecraft.server.level.ServerPlayer;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
public class LuckPermsCompat {
public static final LuckPermsCompat INSTANCE = new LuckPermsCompat();
private final LuckPerms luckPerms = LuckPermsProvider.get();
LuckPermsCompat() {}
LuckPermsCompat() {
EventBus bus = luckPerms.getEventBus();
bus.subscribe(NodeMutateEvent.class, e -> {
if (!e.isUser())
return;
User user = (User) e.getTarget();
Set<InheritanceNode> addedInheritance = e.getDataAfter().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataBefore().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
Set<InheritanceNode> removedInheritance = e.getDataBefore().stream()
.filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataAfter().contains(node))
.map(NodeType.INHERITANCE::cast)
.collect(Collectors.toSet());
if(addedInheritance.isEmpty() && removedInheritance.isEmpty()) return;
addedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupAddedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
removedInheritance.forEach(node -> {
CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupRemovedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
});
});
}
public boolean hasPermission(ServerPlayer player, String perm) {
User luckPermsUser = luckPerms.getPlayerAdapter(ServerPlayer.class).getUser(player);
return luckPermsUser.getCachedData().getPermissionData().checkPermission(perm).asBoolean();
}
public boolean hasGroup(UUID uuid, String group) {
return getUserGroups(uuid).stream().anyMatch(g -> g.equalsIgnoreCase(group));
}
public Set<String> getUserGroups(UUID uuid) {
User user = luckPerms.getUserManager().getUser(uuid);
if (user == null)
return new HashSet<>();
return user.getNodes(NodeType.INHERITANCE).stream().map(InheritanceNode::getGroupName).collect(Collectors.toSet());
}
public boolean addGroupToUser(UUID uuid, String group) {
AtomicBoolean added = new AtomicBoolean(false);
Group g = luckPerms.getGroupManager().getGroup(group);
if (g == null) {
return false;
}
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().add(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
added.set(true);
});
return added.get();
}
public boolean removeGroupFromUser(UUID uuid, String group) {
AtomicBoolean removed = new AtomicBoolean(false);
luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
if (user == null) return;
user.data().remove(InheritanceNode.builder(group).build());
luckPerms.getUserManager().saveUser(user);
removed.set(true);
});
return removed.get();
}
}

View File

@@ -0,0 +1,24 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import dev.ftb.mods.ftbranks.api.Rank;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(staticName = "of")
public class BridgedRank {
private final Rank internal;
public String name() {
return internal.getName();
}
public String id() {
return internal.getId();
}
public Rank toFtb() {
return internal;
}
}

View File

@@ -0,0 +1,83 @@
// @excludeplugin
package com.hypherionmc.craterlib.compat.ftbranks;
import com.hypherionmc.craterlib.api.events.compat.FTBRankEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
import dev.ftb.mods.ftbranks.api.FTBRanksAPI;
import dev.ftb.mods.ftbranks.api.event.PlayerAddedToRankEvent;
import dev.ftb.mods.ftbranks.api.event.PlayerRemovedFromRankEvent;
import dev.ftb.mods.ftbranks.api.event.RankDeletedEvent;
import dev.ftb.mods.ftbranks.api.event.RankEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
public class FTBRanks {
public static final FTBRanks INSTANCE = new FTBRanks();
private FTBRanks() {
registerEvents();
}
public List<BridgedRank> getPlayerRanks(BridgedGameProfile profile) {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.manager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
return ranks;
}
public List<BridgedRank> getAllRanks() {
List<BridgedRank> ranks = new ArrayList<>();
FTBRanksAPI.manager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
return ranks;
}
public boolean hasRank(BridgedGameProfile profile, String rank) {
return getPlayerRanks(profile).stream().anyMatch(r -> r.toFtb().getName().equalsIgnoreCase(rank) || r.toFtb().getId().equalsIgnoreCase(rank));
}
public boolean addRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didAddRank = new AtomicBoolean(false);
FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
r.add(profile.toMojang());
didAddRank.set(true);
});
return didAddRank.get();
}
public boolean removeRank(BridgedGameProfile profile, String rank) {
rank = rank.toLowerCase();
AtomicBoolean didRemoveRank = new AtomicBoolean(false);
FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
r.remove(profile.toMojang());
didRemoveRank.set(true);
});
return didRemoveRank.get();
}
public void registerEvents() {
RankEvent.ADD_PLAYER.register(this::playerAddedToRank);
RankEvent.REMOVE_PLAYER.register(this::playerRemovedFromRank);
RankEvent.DELETED.register(this::rankDeleted);
}
private void rankDeleted(RankDeletedEvent rankDeletedEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankDeletedEvent.of(rankDeletedEvent.getRank()));
}
private void playerRemovedFromRank(PlayerRemovedFromRankEvent playerRemovedFromRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankRemovedEvent.of(playerRemovedFromRankEvent.getPlayer(), playerRemovedFromRankEvent.getRank()));
}
private void playerAddedToRank(PlayerAddedToRankEvent playerAddedToRankEvent) {
CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankAddedEvent.of(playerAddedToRankEvent.getPlayer(), playerAddedToRankEvent.getRank()));
}
}

View File

@@ -10,6 +10,7 @@ dependencies {
}
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Some files were not shown because too many files have changed in this diff Show More