Merge branch 'main' of gitlab.com:distant-horizons-team/distant-horizons

common/src/main/java/com/seibel/distanthorizons/common/commands/AbstractCommand.java

@@ -30,14 +30,14 @@ public abstract class AbstractCommand
 	 * @param text The text to display in the success message.
 	 * @return 1, indicating that the command was successful.
 	 */
-	protected int sendSuccessResponse(CommandContext<CommandSourceStack> commandContext, String text)
+	protected int sendSuccessResponse(CommandContext<CommandSourceStack> commandContext, String text, boolean notifyAdmins)
 	{
 		#if MC_VER >= MC_1_20_1
-		commandContext.getSource().sendSuccess(() -> Component.literal(text), false);
+		commandContext.getSource().sendSuccess(() -> Component.literal(text), notifyAdmins);
 		#elif MC_VER >= MC_1_19_2
-		commandContext.getSource().sendSuccess(Component.literal(text), false);
+		commandContext.getSource().sendSuccess(Component.literal(text), notifyAdmins);
 		#else
-		commandContext.getSource().sendSuccess(new TranslatableComponent(text), false);
+		commandContext.getSource().sendSuccess(new TranslatableComponent(text), notifyAdmins);
 		#endif
 		return 1;
 	}
@@ -61,25 +61,6 @@ public abstract class AbstractCommand
 		return 1;
 	}
 	
-	/**
-	 * Sends a failure response to the player with the given text.
-	 *
-	 * @param commandContext The command context to send the response to.
-	 * @param text The text to display in the failure message.
-	 * @return 1, indicating that the command was successful.
-	 */
-	protected int sendSystemMessage(CommandContext<CommandSourceStack> commandContext, String text)
-	{
-		#if MC_VER >= MC_1_20_1
-		commandContext.getSource().sendSystemMessage(Component.literal(text));
-		#elif MC_VER >= MC_1_19_2
-		commandContext.getSource().sendSystemMessage(Component.literal(text));
-		#else
-		commandContext.getSource().sendSuccess(new TranslatableComponent(text), false);
-		#endif
-		return 1;
-	}
-	
 	/**
 	 * Gets the server player from a command context.
 	 *

common/src/main/java/com/seibel/distanthorizons/common/commands/ConfigCommand.java

@@ -63,12 +63,13 @@ public class ConfigCommand extends AbstractCommand
 									"§o" + configEntry.getComment().trim() + "§r\n" +
 									"§7Config file name: §f" + configEntry.name + "§7, category: §f" + configEntry.category + "\n" +
 									"\n" +
-									"Current value of " + configEntry.getChatCommandName() + " is §n" + configEntry.get() + "§r"
+									"Current value of " + configEntry.getChatCommandName() + " is §n" + configEntry.get() + "§r",
+							false
 					));
 			
 			ToIntBiFunction<CommandContext<CommandSourceStack>, Object> updateConfigValue = (commandContext, value) -> {
 				configEntry.set(value);
-				return this.sendSuccessResponse(commandContext, "Changed the value of ["+configEntry.getChatCommandName()+"] to ["+value+"]");
+				return this.sendSuccessResponse(commandContext, "Changed the value of [" + configEntry.getChatCommandName() + "] to [" + value + "]", true);
 			};
 			
 			// Enum type needs a special case since enums aren't represented by existing argument type

common/src/main/java/com/seibel/distanthorizons/common/commands/DebugCommand.java

@@ -18,7 +18,7 @@ public class DebugCommand extends AbstractCommand
 				.executes(c -> {
 					List<String> lines = new ArrayList<>();
 					F3Screen.addStringToDisplay(lines);
-					return this.sendSuccessResponse(c, String.join("\n", lines));
+					return this.sendSuccessResponse(c, String.join("\n", lines), false);
 				});
 	}
 	

common/src/main/java/com/seibel/distanthorizons/common/commands/PregenCommand.java

@@ -12,6 +12,7 @@ import net.minecraft.commands.arguments.coordinates.ColumnPosArgument;
 import net.minecraft.server.level.ColumnPos;
 import net.minecraft.server.level.ServerLevel;
 
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 
 import static com.mojang.brigadier.arguments.IntegerArgumentType.getInteger;
@@ -47,19 +48,21 @@ public class PregenCommand extends AbstractCommand
 	
 	private int pregenStatus(CommandContext<CommandSourceStack> c)
 	{
-		if (this.pregenManager.getRunningPregen() != null)
+		String statusString = this.pregenManager.getStatusString();
+		//noinspection ReplaceNullCheck
+		if (statusString != null)
 		{
-			return this.sendSuccessResponse(c, "Pregen is running");
+			return this.sendSuccessResponse(c, statusString, false);
 		}
 		else
 		{
-			return this.sendSuccessResponse(c, "Pregen is not running");
+			return this.sendSuccessResponse(c, "Pregen is not running", false);
 		}
 	}
 	
 	private int pregenStart(CommandContext<CommandSourceStack> c) throws CommandSyntaxException
 	{
-		this.sendSuccessResponse(c, "Starting pregen");
+		this.sendSuccessResponse(c, "Starting pregen. Progress will be in the server console.", true);
 		
 		ServerLevel level = DimensionArgument.getDimension(c, "dimension");
 		ColumnPos origin = ColumnPosArgument.getColumnPos(c, "origin");
@@ -68,18 +71,22 @@ public class PregenCommand extends AbstractCommand
 		CompletableFuture<Void> future = this.pregenManager.startPregen(
 				ServerLevelWrapper.getWrapper(level),
 				new DhBlockPos2D(#if MC_VER >= MC_1_19_2 origin.x(), origin.z() #else origin.x, origin.z #endif),
-				chunkRadius,
-				update -> this.sendSystemMessage(c, update)
+				chunkRadius
 		);
 		
 		future.whenComplete((result, throwable) -> {
-			if (throwable != null)
+			if (throwable instanceof CancellationException)
+			{
+				this.sendSuccessResponse(c, "Pregen is cancelled", true);
+				return;
+			}
+			else if (throwable != null)
 			{
 				this.sendFailureResponse(c, "Pregen failed: " + throwable.getMessage() + "\n Check the logs for more details.");
 				return;
 			}
 			
-			this.sendSuccessResponse(c, "Pregen is complete");
+			this.sendSuccessResponse(c, "Pregen is complete", true);
 		});
 		
 		return 1;
@@ -88,11 +95,12 @@ public class PregenCommand extends AbstractCommand
 	private int pregenStop(CommandContext<CommandSourceStack> c)
 	{
 		CompletableFuture<Void> runningPregen = this.pregenManager.getRunningPregen();
-		if (runningPregen != null)
+		if (runningPregen == null)
 		{
-			runningPregen.cancel(true);
+			return this.sendFailureResponse(c, "Pregen is not running");
 		}
 		
+		runningPregen.cancel(true);
 		return 1;
 	}