push for first alpha

way too many additions for detailed description.

src/main/java/me/jonasjones/betterconsolemc/BetterConsoleMC.java

@@ -0,0 +1,52 @@
+package me.jonasjones.betterconsolemc;
+
+import me.jonasjones.betterconsolemc.cmdconfig.CmdConfigHandler;
+import me.jonasjones.betterconsolemc.cmdconfig.CmdConfigs;
+import me.jonasjones.betterconsolemc.command.GameCommandHandler;
+import me.jonasjones.betterconsolemc.modconfig.ModConfigs;
+import me.jonasjones.betterconsolemc.util.CommandPreRegistry;
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+import net.fabricmc.loader.api.FabricLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class BetterConsoleMC implements ModInitializer {
+	// This logger is used to write text to the console and the log file.
+	// It is considered best practice to use your mod id as the logger's name.
+	// That way, it's clear which mod wrote info, warnings, and errors.
+	public static String MODID = "betterconsolemc";
+	public static final Logger LOGGER = LoggerFactory.getLogger(MODID);
+
+	public static boolean ISWINDOWS = System.getProperty("os.name").toLowerCase().startsWith("windows");
+	public static Path CONFIGDIR = FabricLoader.getInstance().getConfigDir();
+	public static CommandPreRegistry COMMANDPREREGISTRY;
+
+	public static void registerCommands() {
+		for (CommandPreRegistry commandPreRegistry : CmdConfigHandler.FULLREG) {
+			COMMANDPREREGISTRY = commandPreRegistry;
+			CommandRegistrationCallback.EVENT.register(GameCommandHandler::register);
+		}
+	}
+
+	@Override
+	public void onInitialize() {
+		// This code runs as soon as Minecraft is in a mod-load-ready state.
+		// However, some things (like resources) may still be uninitialized.
+		// Proceed with mild caution.
+		ModConfigs.registerConfigs();
+		CmdConfigs.registerConfigs();
+		LOGGER.info("BetterConsoleMC initialized!");
+		try {
+			CmdConfigHandler.getCommands(String.valueOf(CONFIGDIR.resolve(BetterConsoleMC.MODID + "-commands_config.properties")));
+			registerCommands();
+		} catch (Exception e) {
+			ModConfigs.IS_ENABLED = false;
+			LOGGER.error("SYNTAX ERROR(S) IN COMMAND CONFIG FILE OF BETTERCONSOLEMC");
+			LOGGER.error("For security reasons, the mod has therefore beeen disabled and all commands are therefore nonfunctional");
+		}
+	}
+}

src/main/java/me/jonasjones/betterconsolemc/command/GameCommandHandler.java

@@ -0,0 +1,41 @@
+package me.jonasjones.betterconsolemc.command;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.context.CommandContext;
+import me.jonasjones.betterconsolemc.BetterConsoleMC;
+import me.jonasjones.betterconsolemc.cmdconfig.CmdConfigHandler;
+import me.jonasjones.betterconsolemc.system.ShellCommand;
+import me.jonasjones.betterconsolemc.util.CommandPreRegistry;
+import net.minecraft.command.CommandRegistryAccess;
+import net.minecraft.command.argument.MessageArgumentType;
+import net.minecraft.server.command.CommandManager;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.text.Text;
+
+import static me.jonasjones.betterconsolemc.BetterConsoleMC.COMMANDPREREGISTRY;
+
+public class GameCommandHandler {
+    public static void register(CommandDispatcher<ServerCommandSource> serverCommandSourceCommandDispatcher, CommandRegistryAccess commandRegistryAccess, CommandManager.RegistrationEnvironment registrationEnvironment) {
+
+        serverCommandSourceCommandDispatcher.register((CommandManager.literal(COMMANDPREREGISTRY.getIngamecommand()).requires(source -> source.hasPermissionLevel(COMMANDPREREGISTRY.getPermissionLevel()))
+                .executes((context -> {
+                    context.getSource().sendFeedback(runCommand(COMMANDPREREGISTRY, context), COMMANDPREREGISTRY.doBroadcastToOp());
+                    return 1;
+                })))
+        );
+        serverCommandSourceCommandDispatcher.register((CommandManager.literal("cmd").requires(source -> source.hasPermissionLevel(4))
+                .then(CommandManager.argument("Console Command", MessageArgumentType.message())
+                        .executes((context -> {
+                            System.out.println("UWU");
+                            return 0;
+                        })))));
+        }
+    public static Text runCommand(CommandPreRegistry commandPreRegistry, CommandContext<ServerCommandSource> context) {
+        new Thread(() -> {ShellCommand.execute(commandPreRegistry, context);}).start();
+        return Text.of("Return");
+    }
+    public static void returnCommandOutput(String cmd, String commandFeedback, CommandContext<ServerCommandSource> context) {
+        String consoleLog = "  [" + cmd + "]: " + commandFeedback;
+        BetterConsoleMC.LOGGER.info(consoleLog);
+    }
+}

src/main/java/me/jonasjones/betterconsolemc/modconfig/ModConfigProvider.java

@@ -0,0 +1,32 @@
+package me.jonasjones.betterconsolemc.modconfig;
+
+import com.mojang.datafixers.util.Pair;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ModConfigProvider implements SimpleConfig.DefaultConfig {
+
+    private String configContents = "";
+
+    public List<Pair> getConfigsList() {
+        return configsList;
+    }
+
+    private final List<Pair> configsList = new ArrayList<>();
+
+    public void addKeyValuePair(Pair<String, ?> keyValuePair, String comment) {
+        configsList.add(keyValuePair);
+        configContents += keyValuePair.getFirst() + "=" + keyValuePair.getSecond() + " #"
+                + comment + " | default: " + keyValuePair.getSecond() + "\n";
+    }
+
+    public void addSingleLineComment(String comment) {
+        configContents += "# " + comment + "\n";
+    }
+
+    @Override
+    public String get(String namespace) {
+        return configContents;
+    }
+}

src/main/java/me/jonasjones/betterconsolemc/modconfig/ModConfigs.java

@@ -0,0 +1,34 @@
+package me.jonasjones.betterconsolemc.modconfig;
+
+import com.mojang.datafixers.util.Pair;
+import me.jonasjones.betterconsolemc.BetterConsoleMC;
+
+public class ModConfigs {
+    public static SimpleConfig MODCONFIG;
+    private static ModConfigProvider modconfigs;
+
+    public static boolean IS_ENABLED;
+    public static boolean REUQIRE_OP;
+
+    public static void registerConfigs() {
+        modconfigs = new ModConfigProvider();
+        createConfigs();
+
+        MODCONFIG = SimpleConfig.of(BetterConsoleMC.MODID + "-config").provider(modconfigs).request();
+
+        assignConfigs();
+    }
+
+    private static void createConfigs() {
+        modconfigs.addSingleLineComment("This is the config file for BetterConsoleMC");
+        modconfigs.addKeyValuePair(new Pair<>("bettercmd.enable", true), "whether or not to the mod is enabled or not.");
+        modconfigs.addKeyValuePair(new Pair<>("bettercmd.requireOp", true), "whether or not operator level is required in order to run commands.");
+    }
+
+    private static void assignConfigs() {
+        IS_ENABLED = MODCONFIG.getOrDefault("cmd.enable", true);
+        REUQIRE_OP = MODCONFIG.getOrDefault("cmd.requireOp", true);
+
+        SimpleConfig.LOGGER.info("All " + modconfigs.getConfigsList().size() + " have been set properly");
+    }
+}

src/main/java/me/jonasjones/betterconsolemc/modconfig/SimpleConfig.java

@@ -0,0 +1,253 @@
+package me.jonasjones.betterconsolemc.modconfig;
+/*
+ * Copyright (c) 2021 magistermaks
+ * Slightly modified by Jonas_Jones 2022
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+import net.fabricmc.loader.api.FabricLoader;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Scanner;
+
+public class SimpleConfig {
+
+    public static final Logger LOGGER = LogManager.getLogger("SimpleConfig");
+    private final HashMap<String, String> config = new HashMap<>();
+    private final ConfigRequest request;
+    private boolean broken = false;
+
+    public interface DefaultConfig {
+        String get( String namespace );
+
+        static String empty( String namespace ) {
+            return "";
+        }
+    }
+
+    public static class ConfigRequest {
+
+        private final File file;
+        private final String filename;
+        private DefaultConfig provider;
+
+        private ConfigRequest(File file, String filename ) {
+            this.file = file;
+            this.filename = filename;
+            this.provider = DefaultConfig::empty;
+        }
+
+        /**
+         * Sets the default config provider, used to generate the
+         * config if it's missing.
+         *
+         * @param provider default config provider
+         * @return current config request object
+         * @see DefaultConfig
+         */
+        public ConfigRequest provider( DefaultConfig provider ) {
+            this.provider = provider;
+            return this;
+        }
+
+        /**
+         * Loads the config from the filesystem.
+         *
+         * @return config object
+         * @see SimpleConfig
+         */
+        public SimpleConfig request() {
+            return new SimpleConfig( this );
+        }
+
+        private String getConfig() {
+            return provider.get( filename ) + "\n";
+        }
+
+    }
+
+    /**
+     * Creates new config request object, ideally `namespace`
+     * should be the name of the mod id of the requesting mod
+     *
+     * @param filename - name of the config file
+     * @return new config request object
+     */
+    public static ConfigRequest of( String filename ) {
+        Path path = FabricLoader.getInstance().getConfigDir();
+        return new ConfigRequest( path.resolve( filename + ".properties" ).toFile(), filename );
+    }
+
+    private void createConfig() throws IOException {
+
+        // try creating missing files
+        request.file.getParentFile().mkdirs();
+        Files.createFile( request.file.toPath() );
+
+        // write default config data
+        PrintWriter writer = new PrintWriter(request.file, "UTF-8");
+        writer.write( request.getConfig() );
+        writer.close();
+
+    }
+
+    private void loadConfig() throws IOException {
+        Scanner reader = new Scanner( request.file );
+        for( int line = 1; reader.hasNextLine(); line ++ ) {
+            parseConfigEntry( reader.nextLine(), line );
+        }
+    }
+
+    private void parseConfigEntry( String entry, int line ) {
+        if( !entry.isEmpty() && !entry.startsWith( "#" ) ) {
+            String[] parts = entry.split("=", 2);
+            if( parts.length == 2 ) {
+                //Recognise comments after a value
+                String temp = parts[1].split(" #")[0];
+                config.put( parts[0], temp);
+            }else{
+                throw new RuntimeException("Syntax error in config file on line " + line + "!");
+            }
+        }
+    }
+
+    private SimpleConfig( ConfigRequest request ) {
+        this.request = request;
+        String identifier = "Config '" + request.filename + "'";
+
+        if( !request.file.exists() ) {
+            LOGGER.info( identifier + " is missing, generating default one..." );
+
+            try {
+                createConfig();
+            } catch (IOException e) {
+                LOGGER.error( identifier + " failed to generate!" );
+                LOGGER.trace( e );
+                broken = true;
+            }
+        }
+
+        if( !broken ) {
+            try {
+                loadConfig();
+            } catch (Exception e) {
+                LOGGER.error( identifier + " failed to load!" );
+                LOGGER.trace( e );
+                broken = true;
+            }
+        }
+
+    }
+
+    /**
+     * Queries a value from config, returns `null` if the
+     * key does not exist.
+     *
+     * @return  value corresponding to the given key
+     * @see     SimpleConfig#getOrDefault
+     */
+    @Deprecated
+    public String get( String key ) {
+        return config.get( key );
+    }
+
+    /**
+     * Returns string value from config corresponding to the given
+     * key, or the default string if the key is missing.
+     *
+     * @return  value corresponding to the given key, or the default value
+     */
+    public String getOrDefault( String key, String def ) {
+        String val = get(key);
+        return val == null ? def : val;
+    }
+
+    /**
+     * Returns integer value from config corresponding to the given
+     * key, or the default integer if the key is missing or invalid.
+     *
+     * @return  value corresponding to the given key, or the default value
+     */
+    public int getOrDefault( String key, int def ) {
+        try {
+            return Integer.parseInt( get(key) );
+        } catch (Exception e) {
+            return def;
+        }
+    }
+
+    /**
+     * Returns boolean value from config corresponding to the given
+     * key, or the default boolean if the key is missing.
+     *
+     * @return  value corresponding to the given key, or the default value
+     */
+    public boolean getOrDefault( String key, boolean def ) {
+        String val = get(key);
+        if( val != null ) {
+            return val.equalsIgnoreCase("true");
+        }
+
+        return def;
+    }
+
+    /**
+     * Returns double value from config corresponding to the given
+     * key, or the default string if the key is missing or invalid.
+     *
+     * @return  value corresponding to the given key, or the default value
+     */
+    public double getOrDefault( String key, double def ) {
+        try {
+            return Double.parseDouble( get(key) );
+        } catch (Exception e) {
+            return def;
+        }
+    }
+
+    /**
+     * If any error occurred during loading or reading from the config
+     * a 'broken' flag is set, indicating that the config's state
+     * is undefined and should be discarded using `delete()`
+     *
+     * @return the 'broken' flag of the configuration
+     */
+    public boolean isBroken() {
+        return broken;
+    }
+
+    /**
+     * deletes the config file from the filesystem
+     *
+     * @return true if the operation was successful
+     */
+    public boolean delete() {
+        LOGGER.warn( "Config '" + request.filename + "' was removed from existence! Restart the game to regenerate it." );
+        return request.file.delete();
+    }
+
+}

src/main/java/me/jonasjones/betterconsolemc/system/ShellCommand.java

@@ -0,0 +1,49 @@
+package me.jonasjones.betterconsolemc.system;
+
+import com.mojang.brigadier.context.CommandContext;
+import me.jonasjones.betterconsolemc.BetterConsoleMC;
+import me.jonasjones.betterconsolemc.command.GameCommandHandler;
+import me.jonasjones.betterconsolemc.util.CommandPreRegistry;
+import net.minecraft.server.command.ServerCommandSource;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class ShellCommand {
+    public static int execute(CommandPreRegistry command, CommandContext<ServerCommandSource> context) {
+
+        ProcessBuilder processBuilder = new ProcessBuilder();
+        if (BetterConsoleMC.ISWINDOWS) {
+            processBuilder.command("cmd.exe", "/c", command.getCommand());
+        } else {
+            processBuilder.command("bash", "-c", command.getCommand());
+        }
+
+        try {
+
+            Process process = processBuilder.start();
+
+            BufferedReader reader =
+                    new BufferedReader(new InputStreamReader(process.getInputStream()));
+
+            String line;
+            while ((line = reader.readLine()) != null) {
+                GameCommandHandler.returnCommandOutput(command.getCommand(), line, context);
+            }
+
+            int exitCode = process.waitFor();
+            if (exitCode == 0) {
+                BetterConsoleMC.LOGGER.info("Exited with error code : " + exitCode);
+            } else {
+                BetterConsoleMC.LOGGER.error("Exited with error code : " + exitCode);
+            }
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        return 1;
+    }
+}

src/main/resources/fabric.mod.json

@@ -0,0 +1,32 @@
+{
+  "schemaVersion": 1,
+  "id": "betterconsolemc",
+  "version": "${version}",
+
+  "name": "Better ConsoleMC",
+  "description": "This is the successor to ConsoleMc. The purpose of this mod is to allow a more controlled and secure environment. Custom commands can be configured in a config file and it is NOT possible to run any command in the server's console.",
+  "authors": [
+    "Jonas_Jones"
+  ],
+  "contact": {
+    "homepage": "https://jonasjones.me/projects/betterconsolemc",
+    "sources": "https://github.com/J-onasJones/BetterConsoleMC"
+  },
+
+  "license": "CC0-1.0",
+  "icon": "assets/betterconsolemc/icon.png",
+
+  "environment": "server",
+  "entrypoints": {
+    "main": [
+      "me.jonasjones.betterconsolemc.BetterConsoleMC"
+    ]
+  },
+
+  "depends": {
+    "fabricloader": ">=0.14.11",
+    "fabric-api": "*",
+    "minecraft": "~1.19.3",
+    "java": ">=17"
+  }
+}