version check & bug fixes

Author: hugeBlack

src/main/java/com/hb/mcfdebugger/commands/DebuggerCommand.java

@@ -8,16 +8,19 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import net.minecraft.command.argument.EntityArgumentType;
-import net.minecraft.command.argument.ObjectiveArgumentType;
-import net.minecraft.command.argument.ScoreHolderArgumentType;
+import net.minecraft.command.argument.*;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.TranslatableText;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec2f;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.ChunkStatus;
 
 public class DebuggerCommand {
     public static final SimpleCommandExceptionType LOGGER_HIT_EXCEPTION = new SimpleCommandExceptionType(new TranslatableText("MCFDEBUGGER: Logger hit."));
     public static final SimpleCommandExceptionType CONSOLE_LOG_HIT_EXCEPTION = new SimpleCommandExceptionType(new TranslatableText("MCFDEBUGGER: Logger hit."));
+
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
         LiteralArgumentBuilder<ServerCommandSource> literalArgumentBuilder = CommandManager.literal("debuggerCmd").
                 requires(source -> source.hasPermissionLevel(2))
@@ -44,13 +47,7 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
                                                 }
                                         )
                                 )
-                        ))
-                .then(CommandManager.literal("all")
-                        .executes((CommandContext<ServerCommandSource> cmd) -> {
-                                    return 1;
-                                }
                         )
-
                 )
                 .then(CommandManager.literal("getEntity")
                         .then(CommandManager.argument("targets", EntityArgumentType.entities())
@@ -69,15 +66,16 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
                                 }
                         )
 
-                )                
+                )
                 .then(CommandManager.literal("log")
                         .executes((CommandContext<ServerCommandSource> cmd) -> {
                                     McfDebugger.nowCommandCount--;
                                     return DebuggerCommand.log(cmd);
                                 }
                         )
 
-                );
+                )
+;
         dispatcher.register(literalArgumentBuilder);
     }
 
@@ -117,6 +115,7 @@ public static int loud(CommandContext<ServerCommandSource> cmd) throws CommandSy
         }
         return 1;
     }
+
     public static int log(CommandContext<ServerCommandSource> cmd) throws CommandSyntaxException {
         if (!McfDebugger.debuggerMode.equals("none")) {
             McfDebugger.nowLogFunNamespace = McfDebugger.lastCmdObj.funNamespace;

src/main/java/com/hb/mcfdebugger/mixin/CommandSourceHook.java

@@ -0,0 +1,14 @@
+package com.hb.mcfdebugger.mixin;
+
+import net.minecraft.server.command.ServerCommandSource;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(ServerCommandSource.class)
+public class CommandSourceHook {
+    @Shadow @Final int level;
+    public int fakeGetLevel(){
+        return this.level;
+    }
+}

src/main/java/com/hb/mcfdebugger/mixinHelpers/SendCommandState.java

@@ -10,6 +10,7 @@
 import net.minecraft.world.World;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -44,9 +45,8 @@ public static void send(CommandFunction.Element element, ServerCommandSource sou
                 sourceMap.put("rotation","("+source.getRotation().x+", "+source.getRotation().y+")");
                 sourceMap.put("world",source.getWorld().getRegistryKey().getValue().toString());
                 try {
-                    Field levelField = source.getClass().getDeclaredField("level");
-                    levelField.setAccessible(true);
-                    sourceMap.put("level",( levelField.get(source)).toString());
+                    Method levelMethod = source.getClass().getDeclaredMethod("fakeGetLevel");
+                    sourceMap.put("level", String.valueOf(levelMethod.invoke(source)));
                 } catch (ReflectiveOperationException e) {
                     sourceMap.put("level","Error");
                 }

src/main/java/com/hb/mcfdebugger/wsCommandParser.java

@@ -133,6 +133,8 @@ public ServerCommandSource getSource() {
                 wsCommandParser.sendMsg("mcfdebugger.reloadCommand");
                 SendFeedBack("reloaded.","Success");
                 break;
+            case "getVersion":
+                DebugThread.sendObjMsgToDebugger("2","versionResult");
             default:
                 SendFeedBack("Unknown command.","Error");
         }

src/main/resources/mcfdebugger.mixins.json

@@ -12,7 +12,8 @@
     "ErrorHook",
     "ServerLoad",
     "FunctionCommandHook",
-    "ServerCommandSourceHook"
+    "ServerCommandSourceHook",
+    "CommandSourceHook"
   ],
   "client": [
     "ExampleMixin"