Skip to content

Add whitelist for identity swaps #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xGabou merged 1 commit into from
Aug 1, 2025
Merged

Add whitelist for identity swaps #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions common/src/main/java/draylar/identity/api/platform/IdentityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ public static IdentityConfig getInstance() {

public abstract boolean enableSwaps();

/**
* Players listed here may swap identities even when {@link #enableSwaps()} is false.
* Names are compared case-insensitively.
*/
public abstract List<String> allowedSwappers();

public abstract int hostilityTime();

public abstract boolean wardenIsBlinded();
Expand Down
5 changes: 4 additions & 1 deletion common/src/main/java/draylar/identity/impl/tick/MenuKeyPressHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ public void tick(MinecraftClient client) {
assert client.player != null;

if(IdentityClient.MENU_KEY.wasPressed()) {
if(IdentityConfig.getInstance().enableClientSwapMenu() || client.player.hasPermissionLevel(3)) {
if(IdentityConfig.getInstance().enableClientSwapMenu() ||
client.player.hasPermissionLevel(3) ||
IdentityConfig.getInstance().allowedSwappers().stream()
.anyMatch(p -> p.equalsIgnoreCase(client.player.getGameProfile().getName()))) {
MinecraftClient.getInstance().setScreen(new IdentityScreen());
}
}
Expand Down
10 changes: 8 additions & 2 deletions common/src/main/java/draylar/identity/network/impl/SwapPackets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ public static void registerIdentityRequestPacketHandler() {

context.getPlayer().getServer().execute(() -> {
// Ensure player has permission to switch identities
if(IdentityConfig.getInstance().enableSwaps() || context.getPlayer().hasPermissionLevel(3)) {
if(IdentityConfig.getInstance().enableSwaps() ||
context.getPlayer().hasPermissionLevel(3) ||
IdentityConfig.getInstance().allowedSwappers().stream()
.anyMatch(p -> p.equalsIgnoreCase(context.getPlayer().getGameProfile().getName()))) {
// player type shouldn't be sent, but we still check regardless
if(entityType.equals(EntityType.PLAYER)) {
PlayerIdentity.updateIdentity((ServerPlayerEntity) context.getPlayer(), null, null);
Expand All @@ -43,7 +46,10 @@ public static void registerIdentityRequestPacketHandler() {
} else {
// Swap back to player if server allows it
context.getPlayer().getServer().execute(() -> {
if(IdentityConfig.getInstance().enableSwaps() || context.getPlayer().hasPermissionLevel(3)) {
if(IdentityConfig.getInstance().enableSwaps() ||
context.getPlayer().hasPermissionLevel(3) ||
IdentityConfig.getInstance().allowedSwappers().stream()
.anyMatch(p -> p.equalsIgnoreCase(context.getPlayer().getGameProfile().getName()))) {
PlayerIdentity.updateIdentity((ServerPlayerEntity) context.getPlayer(), null, null);
}

Expand Down
8 changes: 8 additions & 0 deletions fabric/src/main/java/draylar/identity/fabric/config/IdentityFabricConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ public class IdentityFabricConfig extends IdentityConfig implements Config {
@Comment(value = "If set to false, only operators can switch identities. Used on the server; guaranteed to be authoritative.")
public boolean enableSwaps = true;

@Comment(value = "List of player names allowed to swap identities when swaps are disabled.")
public List<String> allowedSwappers = new ArrayList<>();

@Comment(value = "In blocks, how far can the Enderman ability teleport?")
public int endermanAbilityTeleportDistance = 32;

Expand Down Expand Up @@ -338,6 +341,11 @@ public boolean enableSwaps() {
return enableSwaps;
}

@Override
public List<String> allowedSwappers() {
return allowedSwappers;
}

@Override
public int hostilityTime() {
return hostilityTime;
Expand Down
6 changes: 6 additions & 0 deletions forge/src/main/java/draylar/identity/forge/config/IdentityForgeConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public class IdentityForgeConfig extends IdentityConfig {
public int maxHealth = 20;
public boolean enableClientSwapMenu = true;
public boolean enableSwaps = true;
public List<String> allowedSwappers = new ArrayList<>();
public int endermanAbilityTeleportDistance = 32;
public boolean showPlayerNametag = false;
public boolean forceChangeNew = false;
Expand Down Expand Up @@ -279,6 +280,11 @@ public boolean enableSwaps() {
return enableSwaps;
}

@Override
public List<String> allowedSwappers() {
return allowedSwappers;
}

@Override
public int hostilityTime() {
return hostilityTime;
Expand Down
Loading