Refactor debug

2 files changed, 8 insertions, 10 deletions

diff --git a/src/main/java/de/hysky/skyblocker/debug/Debug.java b/src/main/java/de/hysky/skyblocker/debug/Debug.java
index 5991f72c..1fc22d2a 100644
--- a/src/main/java/de/hysky/skyblocker/debug/Debug.java
+++ b/src/main/java/de/hysky/skyblocker/debug/Debug.java
@@ -1,12 +1,13 @@
 package de.hysky.skyblocker.debug;
 
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.loader.api.FabricLoader;
 
 public class Debug {
 	private static final boolean DEBUG_ENABLED = Boolean.parseBoolean(System.getProperty("skyblocker.debug", "false"));
 
 	public static void init() {
-		if (DEBUG_ENABLED) {
+		if (DEBUG_ENABLED || FabricLoader.getInstance().isDevelopmentEnvironment()) {
 			ClientCommandRegistrationCallback.EVENT.register(DumpPlayersCommand::register);
 		}
 	}
diff --git a/src/main/java/de/hysky/skyblocker/debug/DumpPlayersCommand.java b/src/main/java/de/hysky/skyblocker/debug/DumpPlayersCommand.java
index 598672ef..5f6e0362 100644
--- a/src/main/java/de/hysky/skyblocker/debug/DumpPlayersCommand.java
+++ b/src/main/java/de/hysky/skyblocker/debug/DumpPlayersCommand.java
@@ -1,17 +1,15 @@
 package de.hysky.skyblocker.debug;
 
-import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
-
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
-
 import de.hysky.skyblocker.SkyblockerMod;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandRegistryAccess;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.text.Text;
 
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
+
 public class DumpPlayersCommand {
 	
 	static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess registryAccess) {
@@ -20,14 +18,13 @@ public class DumpPlayersCommand {
 						.then(literal("dumpPlayers")
 								.executes(context -> {
 									FabricClientCommandSource source = context.getSource();
-									MinecraftClient client = source.getClient();
-									
-									client.world.getEntities().forEach(e -> {
+
+									source.getWorld().getEntities().forEach(e -> {
 										if (e instanceof PlayerEntity player) {
-											source.sendFeedback(Text.of("\"" + player.getName().getString() + "\""));
+											source.sendFeedback(Text.of("'" + player.getName().getString() + "'"));
 										}
 									});
-									
+
 									return Command.SINGLE_SUCCESS;
 								}))));
 	}