Add lastExecution and lastOutput to command block dump

Changed logic for creator/updater handling

Author: Ampflower

src/main/java/net/modfest/fireblanket/command/CmdFindReplaceCommand.java

@@ -9,16 +9,19 @@
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.world.ChunkHolder;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.text.HoverEvent;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.CommandBlockExecutor;
 import net.minecraft.world.chunk.WorldChunk;
 import net.modfest.fireblanket.compat.roles.Roles;
+import net.modfest.fireblanket.mixin.accessor.CommandBlockExecutorAccessor;
 import net.modfest.fireblanket.mixinsupport.CommandBE;
 import net.modfest.fireblanket.util.TextUtil;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.ToIntBiFunction;
@@ -192,16 +195,59 @@ static Optional<Text> toText(
 		UUID owner = cbe.fireblanket$getOwner();
 		UUID lastUpdate = cbe.fireblanket$getLastUpdate();
 
-		Text ownerName = TextUtil.getPlayerName(server, owner, "Unknown owner!!");
-		Text lastUpdateName = TextUtil.getPlayerName(server, lastUpdate, "Unknown last update!!");
+		final CommandBlockExecutor executor = cbe.fireblanket$getCommandExecutor();
+
+		Text ownerName = TextUtil.getPlayerName(server, owner, "Unknown")
+			.copy().formatted(Formatting.YELLOW);
+		Text commandText = Text.literal(command).formatted(Formatting.GRAY)
+			.styled(style -> style.withHoverEvent(new HoverEvent.ShowText(executor.getLastOutput())));
+
+		final Text lastExecuted;
+
+		final long lastExecution = ((CommandBlockExecutorAccessor) executor).getLastExecution();
+
+		if (lastExecution == -1) {
+			lastExecuted = TextUtil.unknown.copy().formatted(Formatting.GRAY);
+		} else {
+			final long ticks = executor.getWorld().getTime() - lastExecution;
+
+			final Formatting formatting;
+			if (ticks == 0) {
+				formatting = Formatting.RED;
+			} else if (ticks <= 20) {
+				formatting = Formatting.GOLD;
+			} else if (ticks <= 200) {
+				formatting = Formatting.YELLOW;
+			} else {
+				formatting = Formatting.GREEN;
+			}
+
+			lastExecuted = ExecutorUtils.buildDuration(ticks)
+				.formatted(formatting);
+		}
+
+		if (Objects.equals(owner, lastUpdate)) {
+			return Optional.of(Text.translatableWithFallback(
+				"fireblanket.commands.command.grep.entry.same",
+				"[%s] [%s] [%s]: %s",
+				name,
+				ownerName,
+				lastExecuted,
+				commandText
+			));
+		}
+
+		Text lastUpdateName = TextUtil.getPlayerName(server, lastUpdate, "Unknown")
+			.copy().formatted(Formatting.YELLOW);
 
 		return Optional.of(Text.translatableWithFallback(
 			"fireblanket.commands.command.grep.entry",
-			"[%s] [Owner: %s] [Last updated: %s]: %s",
+			"[%s] [%s / %s] [%s]: %s",
 			name,
 			ownerName,
 			lastUpdateName,
-			command
+			lastExecuted,
+			commandText
 		));
 	}
 

src/main/java/net/modfest/fireblanket/command/ExecutorUtils.java

@@ -142,7 +142,7 @@ static Text toBlame(final BlockEntity blockEntity) {
 		final MutableText location = TextUtil.ofLocationWithTeleport(
 			blockEntity.getWorld(),
 			blockEntity.getPos()
-		);
+		).formatted(Formatting.YELLOW);
 
 		if (blockEntity instanceof CommandBE cbe) {
 			location.styled(style -> style.withHoverEvent(cbe.fireblanket$getBlame()));
@@ -183,7 +183,8 @@ static MutableText toEmojiSpeak(final Entity e) {
 
 	static Text toBlame(final Entity entity) {
 		final MutableText location = TextUtil.ofLocation(entity.getBlockPos())
-			.styled(style -> style.withClickEvent(TextUtil.toClickToTeleport(entity)));
+			.styled(style -> style.withFormatting(Formatting.YELLOW)
+				.withClickEvent(TextUtil.toClickToTeleport(entity)));
 
 		if (entity instanceof CommandBE cbe) {
 			location.styled(style -> style.withHoverEvent(cbe.fireblanket$getBlame()));
@@ -193,4 +194,34 @@ static Text toBlame(final Entity entity) {
 			.append(" @ ")
 			.append(location);
 	}
+
+	// Admittedly this could be better (i.e. off the shelf tooling?)
+	// But not really sure how you'd do that.
+	static MutableText buildDuration(long ticks) {
+		if (ticks == 0) {
+			return Text.literal("Now");
+		}
+
+		long seconds = ticks / 20;
+		ticks %= 20;
+
+		if (seconds == 0) {
+			return Text.literal(ticks + " ticks");
+		}
+
+		long minutes = seconds / 60;
+		seconds %= 60;
+
+		long hours = minutes / 60;
+		minutes %= 60;
+
+		long days = hours / 24;
+		hours %= 24;
+
+		if (days == 0) {
+			return Text.literal(String.format("%02d:%02d:%02d.%02d", hours, minutes, seconds, ticks));
+		}
+
+		return Text.literal(String.format("%d %02d:%02d:%02d.%02d", days, hours, minutes, seconds, ticks));
+	}
 }

src/main/java/net/modfest/fireblanket/mixin/accessor/CommandBlockExecutorAccessor.java

@@ -0,0 +1,14 @@
+package net.modfest.fireblanket.mixin.accessor;
+
+import net.minecraft.world.CommandBlockExecutor;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+/**
+ * @author Ampflower
+ **/
+@Mixin(CommandBlockExecutor.class)
+public interface CommandBlockExecutorAccessor {
+	@Accessor
+	long getLastExecution();
+}

src/main/java/net/modfest/fireblanket/util/TextUtil.java

@@ -48,7 +48,7 @@ public final class TextUtil {
 			.withHoverEvent(new HoverEvent.ShowText(Text.translatable("fireblanket.spoofed.tooltip")))
 	);
 
-	private static final Text unknown = Text.translatableWithFallback("fireblanket.unknown", "???")
+	public static final Text unknown = Text.translatableWithFallback("fireblanket.unknown", "???")
 		.formatted(Formatting.GRAY, Formatting.ITALIC);
 
 

src/main/resources/assets/fireblanket/lang/en_us.json

@@ -4,7 +4,8 @@
 	"gamerule.newEntitiesImmutable": "Whether newly spawned entities should be immutable. (Item frames will be fixed for example)",
 	"commands.gamerule.locked": "You do not have permission to modify this gamerule",
 	"commandsBlock.commandSetByPlayer": "%s set the command at (%s) to: %s",
-	"fireblanket.commands.command.grep.entry": "[%s] [Owner: %s] [Last updated: %s]: %s",
+	"fireblanket.commands.command.grep.entry": "[%s] [Creator: %s] [Updater: %s] [%s]\n> %s",
+	"fireblanket.commands.command.grep.entry.same": "[%s] [%s] [%s]\n> %s",
 	"fireblanket.commands.command.grep.result": "Found %s matches.",
 	"fireblanket.commands.command.sed.result.0": "Replaced %s occurrence across %s block",
 	"fireblanket.commands.command.sed.result.1": "Replaced %s occurrences across %s block",

src/main/resources/fireblanket.mixins.json

@@ -7,6 +7,7 @@
 		"accessor.ArmorStandEntityAccessor",
 		"accessor.BlockEntityTypeAccessor",
 		"accessor.ClientConnectionAccessor",
+		"accessor.CommandBlockExecutorAccessor",
 		"accessor.CommandBlockMinecartEntityAccessor",
 		"accessor.EntityTypeAccessor",
 		"accessor.EntityVelocityUpdateS2CPacketAccessor",