Skip to content
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

Jump to bottom

Added Forge PermissionAPI support #23

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added Forge PermissionAPI support #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b59be55
Added Forge PermissionAPI support
edoren Jun 20, 2023
8f429ec
Merge branch 'master' into develop-permissions
edoren Jun 20, 2023
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
4 changes: 2 additions & 2 deletions src/main/java/me/edoren/skin_changer/SkinChanger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import me.edoren.skin_changer.common.NetworkContext;
import me.edoren.skin_changer.server.ServerController;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.server.ServerStartedEvent;
import net.minecraftforge.event.server.ServerAboutToStartEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
Expand All @@ -29,7 +29,7 @@ private void onClientSetup(final FMLClientSetupEvent event) {
ClientController.GetInstance().initialize();
}

private void onServerStarted(ServerStartedEvent event) {
private void onServerStarted(ServerAboutToStartEvent event) {
ServerController.GetInstance().initialize(event.getServer());
}
}
6 changes: 5 additions & 1 deletion src/main/java/me/edoren/skin_changer/server/ServerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package me.edoren.skin_changer.server;

import me.edoren.skin_changer.common.Constants;
import me.edoren.skin_changer.server.permission.PermissionController;
import me.edoren.skin_changer.server.providers.CrafatarCapeProvider;
import me.edoren.skin_changer.server.providers.CrafatarSkinProvider;
import net.minecraft.server.MinecraftServer;
Expand All @@ -13,6 +14,8 @@
public class ServerController {
private static ServerController singleInstance = null;

private final PermissionController permissionController = new PermissionController();

public static ServerController GetInstance() {
if (singleInstance == null)
singleInstance = new ServerController();
Expand All @@ -21,10 +24,11 @@ public static ServerController GetInstance() {
}

private ServerController() {
this.permissionController.initialize();
}

public void initialize(MinecraftServer server) {
SkinsCommand.register(server.getFunctions().getDispatcher());
SkinsCommand.register(server.getFunctions().getDispatcher(), this.permissionController);

Path savesFolder = server.getWorldPath(LevelResource.ROOT);
File skinChangerFolder = Paths.get(savesFolder.toString(), Constants.MOD_ID).normalize().toFile();
Expand Down
67 changes: 48 additions & 19 deletions src/main/java/me/edoren/skin_changer/server/SkinsCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import me.edoren.skin_changer.common.SharedPool;
import me.edoren.skin_changer.server.permission.PermissionController;
import net.minecraft.commands.CommandSource;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.commands.arguments.EntityArgument;
import net.minecraft.commands.arguments.MessageArgument;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import net.minecraftforge.server.permission.PermissionAPI;
import net.minecraftforge.server.permission.nodes.PermissionNode;

import java.net.MalformedURLException;
import java.net.URL;
Expand All @@ -35,63 +39,88 @@ interface Function3<T, U, V, R> {

static final Component ISSUER = Component.literal("SkinChanger");

public static Boolean checkPermission(ServerPlayer player, PermissionNode<Boolean> permissionNode) {
if (player != null && permissionNode != null) {
return PermissionAPI.getPermission(player, permissionNode);
}
return false;
}

public static ArgumentBuilder<CommandSourceStack, ?> setCommand(Function3<CommandSourceStack, Player, String, Integer> setFunction,
Function<CommandContext<CommandSourceStack>, Player> getTarget) {
return Commands.literal("set").then(Commands.argument("arg", MessageArgument.message()).executes((context) ->
setFunction.apply(context.getSource(), getTarget.apply(context), MessageArgument.getMessage(context, "arg").getString())
));
Function<CommandContext<CommandSourceStack>, Player> getTarget,
PermissionNode<Boolean> permissionNode) {
return Commands.literal("set")
.requires((player) -> (permissionNode != null) ? checkPermission(player.getPlayer(), permissionNode) : true)
.then(Commands.argument("arg", MessageArgument.message()).executes((context) ->
setFunction.apply(context.getSource(), getTarget.apply(context), MessageArgument.getMessage(context, "arg").getString())
));
}

public static ArgumentBuilder<CommandSourceStack, ?> clearCommand(Function2<CommandSourceStack, Player, Integer> clearFunction,
Function<CommandContext<CommandSourceStack>, Player> getTarget) {
return Commands.literal("clear").executes((context) ->
clearFunction.apply(context.getSource(), getTarget.apply(context))
);
Function<CommandContext<CommandSourceStack>, Player> getTarget,
PermissionNode<Boolean> permissionNode) {
return Commands.literal("clear")
.requires((player) -> (permissionNode != null) ? checkPermission(player.getPlayer(), permissionNode) : true)
.executes((context) ->
clearFunction.apply(context.getSource(), getTarget.apply(context))
);
}

public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
public static void register(CommandDispatcher<CommandSourceStack> dispatcher, PermissionController permissionController) {
dispatcher.register(Commands.literal("skin")
.requires((player) -> checkPermission(player.getPlayer(), permissionController.getNode("skin")))
.then(setCommand(
SkinsCommand::setPlayerSkin,
(context) -> context.getSource().getPlayerOrException())
(context) -> context.getSource().getPlayerOrException(),
permissionController.getNode("skin.set"))
)
.then(clearCommand(
SkinsCommand::clearPlayerSkin,
(context) -> context.getSource().getPlayerOrException())
(context) -> context.getSource().getPlayerOrException(),
permissionController.getNode("skin.clear"))
)
.then(Commands.literal("player")
.requires((player) -> player.hasPermission(2))
.requires((player) -> (player.hasPermission(2) ||
checkPermission(player.getPlayer(), permissionController.getNode("admin"))))
.then(Commands.argument("target", EntityArgument.player())
.then(setCommand(
SkinsCommand::setPlayerSkin,
(context) -> EntityArgument.getPlayer(context, "target"))
(context) -> EntityArgument.getPlayer(context, "target"),
null)
)
.then(clearCommand(
SkinsCommand::clearPlayerSkin,
(context) -> EntityArgument.getPlayer(context, "target"))
(context) -> EntityArgument.getPlayer(context, "target"),
null)
)
)
)
);
dispatcher.register(Commands.literal("cape")
.requires((player) -> checkPermission(player.getPlayer(), permissionController.getNode("cape")))
.then(setCommand(
SkinsCommand::setPlayerCape,
(context) -> context.getSource().getPlayerOrException())
(context) -> context.getSource().getPlayerOrException(),
permissionController.getNode("cape.set"))
)
.then(clearCommand(
SkinsCommand::clearPlayerCape,
(context) -> context.getSource().getPlayerOrException())
(context) -> context.getSource().getPlayerOrException(),
permissionController.getNode("cape.clear"))
)
.then(Commands.literal("player")
.requires((player) -> player.hasPermission(2))
.requires((player) -> player.hasPermission(2) ||
checkPermission(player.getPlayer(), permissionController.getNode("admin")))
.then(Commands.argument("target", EntityArgument.player())
.then(setCommand(
SkinsCommand::setPlayerCape,
(context) -> EntityArgument.getPlayer(context, "target"))
(context) -> EntityArgument.getPlayer(context, "target"),
null)
)
.then(clearCommand(
SkinsCommand::clearPlayerCape,
(context) -> EntityArgument.getPlayer(context, "target"))
(context) -> EntityArgument.getPlayer(context, "target"),
null)
)
)
)
Expand Down
50 changes: 50 additions & 0 deletions src/main/java/me/edoren/skin_changer/server/permission/PermissionController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package me.edoren.skin_changer.server.permission;

import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.server.permission.events.PermissionGatherEvent;
import net.minecraftforge.server.permission.nodes.PermissionNode;
import net.minecraftforge.server.permission.nodes.PermissionTypes;

import java.util.Arrays;
import java.util.HashMap;
import java.util.List;

public class PermissionController {
private final HashMap<String, PermissionNode<?>> nodesMap = new HashMap<>();
Boolean isRegistered = false;

public PermissionController() {
var defaultTrue = (PermissionNode.PermissionResolver<Boolean>) (player, playerUUID, context) -> true;
var defaultFalse = (PermissionNode.PermissionResolver<Boolean>) (player, playerUUID, context) -> false;

List<PermissionNode<Boolean>> nodes = Arrays.asList(
new PermissionNode<>("skin_changer", "skin", PermissionTypes.BOOLEAN, defaultTrue),
new PermissionNode<>("skin_changer", "skin.set", PermissionTypes.BOOLEAN, defaultTrue),
new PermissionNode<>("skin_changer", "skin.clear", PermissionTypes.BOOLEAN, defaultTrue),

new PermissionNode<>("skin_changer", "cape", PermissionTypes.BOOLEAN, defaultTrue),
new PermissionNode<>("skin_changer", "cape.set", PermissionTypes.BOOLEAN, defaultTrue),
new PermissionNode<>("skin_changer", "cape.clear", PermissionTypes.BOOLEAN, defaultTrue),

new PermissionNode<>("skin_changer", "admin", PermissionTypes.BOOLEAN, defaultFalse)
);

for (PermissionNode<Boolean> node : nodes) {
this.nodesMap.put(node.getNodeName(), node);
}
}

public void initialize() {
if (!isRegistered) {
MinecraftForge.EVENT_BUS.addListener((PermissionGatherEvent.Nodes event) -> {
event.addNodes(this.nodesMap.values());
});
}
this.isRegistered = true;
}

@SuppressWarnings("unchecked")
public PermissionNode<Boolean> getNode(String nodeName) {
return (PermissionNode<Boolean>) nodesMap.get("skin_changer." + nodeName);
}
}