diff --git a/README.md b/README.md
index 7a0b284..4b05929 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,27 @@
-# BetterConsoleMC
- A more controlable and safer successor to the ConsoleMC mod
+# Better ConsoleMC
+*The successor to the [ConsoleMC](https://github.com/J-onasJones/ConsoleMC) mod*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+## Setup
+
+For setup instructions please see the [fabric wiki page](https://fabricmc.net/wiki/tutorial:setup) that relates to the IDE that you are using.
+
+## License
+
+This template is available under the CC0 license. Feel free to learn from it and incorporate it in your own projects.
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..6d30805
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,77 @@
+plugins {
+ id 'fabric-loom' version '1.0-SNAPSHOT'
+ id 'maven-publish'
+}
+
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
+
+archivesBaseName = project.archives_base_name
+version = project.mod_version
+group = project.maven_group
+
+repositories {
+ // Add repositories to retrieve artifacts from in here.
+ // You should only use this when depending on other mods because
+ // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+ // See https://docs.gradle.org/current/userguide/declaring_repositories.html
+ // for more information about repositories.
+}
+
+dependencies {
+ // To change the versions see the gradle.properties file
+ minecraft "com.mojang:minecraft:${project.minecraft_version}"
+ mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+ modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+ // Fabric API. This is technically optional, but you probably want it anyway.
+ modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+ // Uncomment the following line to enable the deprecated Fabric API modules.
+ // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
+
+ // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
+}
+
+processResources {
+ inputs.property "version", project.version
+
+ filesMatching("fabric.mod.json") {
+ expand "version": project.version
+ }
+}
+
+tasks.withType(JavaCompile).configureEach {
+ // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+ it.options.release = 17
+}
+
+java {
+ // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+ // if it is present.
+ // If you remove this line, sources will not be generated.
+ withSourcesJar()
+}
+
+jar {
+ from("LICENSE") {
+ rename { "${it}_${project.archivesBaseName}"}
+ }
+}
+
+// configure the maven publication
+publishing {
+ publications {
+ mavenJava(MavenPublication) {
+ from components.java
+ }
+ }
+
+ // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+ repositories {
+ // Add repositories to publish to here.
+ // Notice: This block does NOT have the same function as the block in the top level.
+ // The repositories here will be used for publishing your artifact, not for
+ // retrieving dependencies.
+ }
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..1b4c270
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,17 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+
+# Fabric Properties
+ # check these on https://fabricmc.net/develop
+ minecraft_version=1.19.3
+ yarn_mappings=1.19.3+build.1
+ loader_version=0.14.11
+
+# Mod Properties
+ mod_version = 0.0.1-alpha
+ maven_group = me.jonasjones
+ archives_base_name = betterconsolemc
+
+# Dependencies
+ fabric_version=0.68.1+1.19.3
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..943f0cb
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..f398c33
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..65dcd68
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,244 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..93e3f59
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..b02216b
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,10 @@
+pluginManagement {
+ repositories {
+ maven {
+ name = 'Fabric'
+ url = 'https://maven.fabricmc.net/'
+ }
+ mavenCentral()
+ gradlePluginPortal()
+ }
+}
diff --git a/src/main/java/me/jonasjones/betterconsolemc/BetterConsoleMC.java b/src/main/java/me/jonasjones/betterconsolemc/BetterConsoleMC.java
new file mode 100644
index 0000000..b7c18db
--- /dev/null
+++ b/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");
+ }
+ }
+}
diff --git a/src/main/java/me/jonasjones/betterconsolemc/command/GameCommandHandler.java b/src/main/java/me/jonasjones/betterconsolemc/command/GameCommandHandler.java
new file mode 100644
index 0000000..6ac71bc
--- /dev/null
+++ b/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 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 context) {
+ new Thread(() -> {ShellCommand.execute(commandPreRegistry, context);}).start();
+ return Text.of("Return");
+ }
+ public static void returnCommandOutput(String cmd, String commandFeedback, CommandContext context) {
+ String consoleLog = " [" + cmd + "]: " + commandFeedback;
+ BetterConsoleMC.LOGGER.info(consoleLog);
+ }
+}
diff --git a/src/main/java/me/jonasjones/betterconsolemc/modconfig/ModConfigProvider.java b/src/main/java/me/jonasjones/betterconsolemc/modconfig/ModConfigProvider.java
new file mode 100644
index 0000000..79b457b
--- /dev/null
+++ b/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 getConfigsList() {
+ return configsList;
+ }
+
+ private final List configsList = new ArrayList<>();
+
+ public void addKeyValuePair(Pair 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;
+ }
+}
diff --git a/src/main/java/me/jonasjones/betterconsolemc/modconfig/ModConfigs.java b/src/main/java/me/jonasjones/betterconsolemc/modconfig/ModConfigs.java
new file mode 100644
index 0000000..6bbeb03
--- /dev/null
+++ b/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");
+ }
+}
diff --git a/src/main/java/me/jonasjones/betterconsolemc/modconfig/SimpleConfig.java b/src/main/java/me/jonasjones/betterconsolemc/modconfig/SimpleConfig.java
new file mode 100644
index 0000000..fce233f
--- /dev/null
+++ b/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 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();
+ }
+
+}
diff --git a/src/main/java/me/jonasjones/betterconsolemc/system/ShellCommand.java b/src/main/java/me/jonasjones/betterconsolemc/system/ShellCommand.java
new file mode 100644
index 0000000..d8896aa
--- /dev/null
+++ b/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 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;
+ }
+}
diff --git a/src/main/resources/assets/betterconsolemc/icon.png b/src/main/resources/assets/betterconsolemc/icon.png
new file mode 100644
index 0000000..047b91f
Binary files /dev/null and b/src/main/resources/assets/betterconsolemc/icon.png differ
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
new file mode 100644
index 0000000..95a2dce
--- /dev/null
+++ b/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"
+ }
+}