Jonas_Jones/BetterConsoleMC
1
0
Fork 0
mirror of https://github.com/JonasunderscoreJones/BetterConsoleMC.git synced 2025-10-25 14:39:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

wip alias implementation

Browse source
This commit is contained in:
Jonas_Jones 2024-09-15 02:33:51 +02:00
parent 9f3750b52d
commit 16c45c7cf5
7 changed files with 83 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/me/jonasjones/betterconsolemc/command/GameCommandHandler.java
View file

@ -8,7 +8,9 @@ import me.jonasjones.betterconsolemc.system.ShellCommand;
import me.jonasjones.betterconsolemc.util.CommandPreRegistry;
import me.jonasjones.betterconsolemc.util.Constants;
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.minecraft.command.CommandRegistryAccess;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.command.CommandManager;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.Text;
@ -17,6 +19,8 @@ import static me.jonasjones.betterconsolemc.BetterConsoleMC.COMMANDPREREGISTRY;
public class GameCommandHandler {
private static MinecraftServer MC_SERVER;
public static void registerCommands() {
CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
for (CommandPreRegistry commandPreRegistry : CmdConfigHandler.FULLREG) {
@ -28,6 +32,18 @@ public class GameCommandHandler {
public static void register(CommandDispatcher<ServerCommandSource> serverCommandSourceCommandDispatcher, CommandRegistryAccess commandRegistryAccess, CommandManager.RegistrationEnvironment registrationEnvironment, CommandPreRegistry commandPreRegistry) {
if (commandPreRegistry.getCommandmode() == Constants.CmdMode.GLOBALALIAS || commandPreRegistry.getCommandmode() == Constants.CmdMode.SELFALIAS) {
serverCommandSourceCommandDispatcher.register((CommandManager.literal(commandPreRegistry.getIngamecommand()).requires(source -> source.hasPermissionLevel(commandPreRegistry.getPermissionLevel()))
.executes((context -> {
runIngameCommand(commandPreRegistry, context);
return 1;
})))
);
// if a command is an alias type, register the tick event
startServerHandler();
return;
}
serverCommandSourceCommandDispatcher.register((CommandManager.literal(commandPreRegistry.getIngamecommand()).requires(source -> source.hasPermissionLevel(commandPreRegistry.getPermissionLevel()))
.executes((context -> {
if (commandPreRegistry.getCommandmode() == Constants.CmdMode.RETURN) {
@ -43,8 +59,24 @@ public class GameCommandHandler {
return Text.of(ShellCommand.execute(commandPreRegistry, context));
}
public static void runIngameCommand(CommandPreRegistry commandPreRegistry, CommandContext<ServerCommandSource> context) {
if (commandPreRegistry.getCommandmode() == Constants.CmdMode.GLOBALALIAS) {
MC_SERVER.getCommandManager().executeWithPrefix(MC_SERVER.getCommandSource(), commandPreRegistry.getCommand());
} else {
MC_SERVER.getCommandManager().executeWithPrefix(context.getSource(), commandPreRegistry.getCommand());
}
}
public static void returnCommandOutput(String cmd, String commandFeedback, CommandContext<ServerCommandSource> context) {
String consoleLog = " [" + cmd + "]: " + commandFeedback;
BetterConsoleMC.LOGGER.info(consoleLog);
}
private static void startServerHandler() {
ServerTickEvents.END_SERVER_TICK.register(server -> {
if (server.isRunning()) {
MC_SERVER = server;
}
});
}
}