From 076017bec57b7cfce1c2ca02c6a60a5b6a2522f8 Mon Sep 17 00:00:00 2001
From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com>
Date: Thu, 7 Sep 2023 20:23:05 +0200
Subject: [PATCH] code cleanup and respect command return type

---
 gradle.properties                                            | 2 +-
 .../betterconsolemc/command/GameCommandHandler.java          | 5 ++++-
 .../me/jonasjones/betterconsolemc/system/ShellCommand.java   | 2 --
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 1222a90..45660da 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ yarn_mappings=1.20.1+build.10
 loader_version=0.14.22
 
 # Mod Properties
-mod_version = 0.0.1+alpha-build03
+mod_version = 0.0.1+alpha-build04
 maven_group = me.jonasjones
 archives_base_name = betterconsolemc
 
diff --git a/src/main/java/me/jonasjones/betterconsolemc/command/GameCommandHandler.java b/src/main/java/me/jonasjones/betterconsolemc/command/GameCommandHandler.java
index 5186be1..897c9b5 100644
--- a/src/main/java/me/jonasjones/betterconsolemc/command/GameCommandHandler.java
+++ b/src/main/java/me/jonasjones/betterconsolemc/command/GameCommandHandler.java
@@ -6,6 +6,7 @@ import me.jonasjones.betterconsolemc.BetterConsoleMC;
 import me.jonasjones.betterconsolemc.cmdconfig.CmdConfigHandler;
 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.minecraft.command.CommandRegistryAccess;
 import net.minecraft.server.command.CommandManager;
@@ -29,7 +30,9 @@ public class GameCommandHandler {
 
         serverCommandSourceCommandDispatcher.register((CommandManager.literal(commandPreRegistry.getIngamecommand()).requires(source -> source.hasPermissionLevel(commandPreRegistry.getPermissionLevel()))
                 .executes((context -> {
-                    context.getSource().sendFeedback(() -> runCommand(commandPreRegistry, context), commandPreRegistry.doBroadcastToOp());
+                    if (commandPreRegistry.getCommandmode() == Constants.CmdMode.RETURN) {
+                        context.getSource().sendFeedback(() -> runCommand(commandPreRegistry, context), commandPreRegistry.doBroadcastToOp());
+                    }
                     return 1;
                 })))
         );
diff --git a/src/main/java/me/jonasjones/betterconsolemc/system/ShellCommand.java b/src/main/java/me/jonasjones/betterconsolemc/system/ShellCommand.java
index 0be0072..1a5285f 100644
--- a/src/main/java/me/jonasjones/betterconsolemc/system/ShellCommand.java
+++ b/src/main/java/me/jonasjones/betterconsolemc/system/ShellCommand.java
@@ -36,8 +36,6 @@ public class ShellCommand {
                     GameCommandHandler.returnCommandOutput(command.getCommand(), line, context);
                 }
                 //get the ingame command name
-
-
                 output.append("[").append(command.getIngamecommand()).append("]").append(line).append("\n");
             }