From c8a64488be822122f5e36bf359927e5ae79180a0 Mon Sep 17 00:00:00 2001
From: Beomjun Kim <nutyworks@gmail.com>
Date: Mon, 18 Mar 2024 15:16:10 +0900
Subject: [PATCH 1/4] Add item, text component tooltips

---
 .../calcite/screen/CalciteCommandScreen.java  | 101 ++++++++++----
 .../calcite/screen/CalciteInputSuggestor.java |  10 +-
 .../widget/CalciteTextFieldWidget.java        | 126 ++++++++++++------
 3 files changed, 171 insertions(+), 66 deletions(-)

diff --git a/src/client/java/works/nuty/calcite/screen/CalciteCommandScreen.java b/src/client/java/works/nuty/calcite/screen/CalciteCommandScreen.java
index aa6a560..6ce4de1 100644
--- a/src/client/java/works/nuty/calcite/screen/CalciteCommandScreen.java
+++ b/src/client/java/works/nuty/calcite/screen/CalciteCommandScreen.java
@@ -37,6 +37,8 @@ public class CalciteCommandScreen extends Screen {
     private final BlockPos blockPos;
     private boolean isInitialized = false;
     private CommandListWidget commandListWidget;
+    private ButtonWidget doneButton;
+    private ButtonWidget cancelButton;
     @Nullable
     private Runnable commandSuggestorRenderer;
 
@@ -100,7 +102,7 @@ public List<CommandBlockBlockEntity> getConnectedCommandBlocks() {
     }
 
     @Nullable
-    private CommandWidget getFocusedCommandWidget() {
+    private AbstractCommandWidget getFocusedCommandWidget() {
         return this.commandListWidget.getFocused();
     }
 
@@ -113,6 +115,7 @@ protected void init() {
             for (CommandBlockBlockEntity blockEntity : connectedCommandBlocks) {
                 this.commandListWidget.addCommandBlock(blockEntity);
             }
+            this.commandListWidget.addBlank();
 
             this.commandListWidget.setFocused(this.commandListWidget.positionedWidgets.get(this.blockPos));
             this.commandListWidget.scrollToFocused();
@@ -127,16 +130,12 @@ protected void init() {
             }
         }
 
-        this.addDrawableChild(
-                ButtonWidget.builder(ScreenTexts.DONE, button -> this.commitAndClose())
-                        .dimensions(this.width - 10 - 200 - 5, this.height - 25, 100, 20)
-                        .build()
-        );
-        this.addDrawableChild(
-                ButtonWidget.builder(ScreenTexts.CANCEL, button -> this.close())
-                        .dimensions(this.width - 10 - 100, this.height - 25, 100, 20)
-                        .build()
-        );
+        this.doneButton = ButtonWidget.builder(ScreenTexts.DONE, button -> this.commitAndClose())
+            .dimensions(this.width - 10 - 200 - 5, this.height - 25, 100, 20)
+            .build();
+        this.cancelButton = ButtonWidget.builder(ScreenTexts.CANCEL, button -> this.close())
+            .dimensions(this.width - 10 - 100, this.height - 25, 100, 20)
+            .build();
         this.isInitialized = true;
     }
 
@@ -149,7 +148,7 @@ public void resize(MinecraftClient client, int width, int height) {
 
     @Override
     public boolean shouldCloseOnEsc() {
-        return this.commandListWidget.children().stream().noneMatch(CommandWidget::isModified);
+        return this.commandListWidget.children().stream().noneMatch(AbstractCommandWidget::isModified);
     }
 
     private void commitAndClose() {
@@ -174,7 +173,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
             return true;
         }
         if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
-            CommandWidget focused = this.commandListWidget.getFocused();
+            AbstractCommandWidget focused = this.commandListWidget.getFocused();
             if (focused != null) {
                 this.commandListWidget.setFocused(null);
                 return true;
@@ -193,12 +192,20 @@ public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmou
 
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        for (CommandWidget widget : this.commandListWidget.children()) {
-            if (widget.modeButton.mouseClicked(mouseX, mouseY, button)) {
-                return true;
-            }
-            if (widget.autoActivateButton.mouseClicked(mouseX, mouseY, button)) {
-                return true;
+        if (this.doneButton.mouseClicked(mouseX, mouseY, button)) {
+            return true;
+        }
+        if (this.cancelButton.mouseClicked(mouseX, mouseY, button)) {
+            return true;
+        }
+        for (AbstractCommandWidget widget : this.commandListWidget.children()) {
+            if (widget instanceof CommandWidget cw) {
+                if (cw.modeButton.mouseClicked(mouseX, mouseY, button)) {
+                    return true;
+                }
+                if (cw.autoActivateButton.mouseClicked(mouseX, mouseY, button)) {
+                    return true;
+                }
             }
         }
         if (this.commandListWidget.mouseClicked(mouseX, mouseY, button)) {
@@ -223,15 +230,49 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
             commandSuggestorRenderer.run();
             commandSuggestorRenderer = null;
         }
+
+        doneButton.render(context, mouseX, mouseY, delta);
+        cancelButton.render(context, mouseX, mouseY, delta);
+    }
+
+    @Environment(EnvType.CLIENT)
+    public abstract static class AbstractCommandWidget extends ElementListWidget.Entry<AbstractCommandWidget> {
+        abstract public boolean isModified();
+    }
+
+    @Environment(EnvType.CLIENT)
+    public static class BlankCommandWidget extends AbstractCommandWidget {
+        public BlankCommandWidget() {
+        }
+
+        @Override
+        public List<? extends Selectable> selectableChildren() {
+            return List.of();
+        }
+
+        @Override
+        public List<? extends Element> children() {
+            return List.of();
+        }
+
+        @Override
+        public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
+
+        }
+
+        public boolean isModified() {
+            return false;
+        }
     }
 
     @Environment(EnvType.CLIENT)
-    public class CommandListWidget extends ElementListWidget<CommandWidget> {
+    public class CommandListWidget extends ElementListWidget<AbstractCommandWidget> {
         private List<CommandWidget> indexedWidgets;
         private Map<BlockPos, CommandWidget> positionedWidgets;
 
         public CommandListWidget() {
-            super(CalciteCommandScreen.this.client, CalciteCommandScreen.this.width, CalciteCommandScreen.this.height - 34, 5, 24);
+            super(CalciteCommandScreen.this.client, CalciteCommandScreen.this.width, CalciteCommandScreen.this.height, 0, 24);
+            this.headerHeight = 5;
             this.indexedWidgets = new ArrayList<>();
             this.positionedWidgets = new HashMap<>();
             this.setRenderBackground(false);
@@ -242,13 +283,15 @@ protected void apply(CommandListWidget clw) {
             this.positionedWidgets = clw.positionedWidgets;
             for (var child : clw.children()) {
                 this.addEntry(child);
-                child.commandEdit.setWidth(CalciteCommandScreen.this.width - 70);
+                if (child instanceof CommandWidget cw) {
+                    cw.commandEdit.setWidth(CalciteCommandScreen.this.width - 70);
+                }
             }
         }
 
         @Override
         protected int getScrollbarPositionX() {
-            return this.width - 10;
+            return this.width - 6;
         }
 
         @Override
@@ -263,11 +306,15 @@ public void addCommandBlock(CommandBlockBlockEntity blockEntity) {
             this.addEntry(widget);
         }
 
+        public void addBlank() {
+            this.addEntry(new BlankCommandWidget());
+        }
+
         @Override
         public boolean mouseClicked(double mouseX, double mouseY, int button) {
-            CommandWidget widget = this.getFocused();
-            if (widget != null) {
-                if (widget.commandSuggestor.mouseClicked(mouseX, mouseY, button)) {
+            AbstractCommandWidget widget = this.getFocused();
+            if (widget instanceof CommandWidget cw) {
+                if (cw.commandSuggestor.mouseClicked(mouseX, mouseY, button)) {
                     return true;
                 }
             }
@@ -296,7 +343,7 @@ public void scrollToFocused() {
     }
 
     @Environment(EnvType.CLIENT)
-    public class CommandWidget extends ElementListWidget.Entry<CommandWidget> {
+    public class CommandWidget extends AbstractCommandWidget {
         protected final CalciteInputSuggestor commandSuggestor;
         protected final List<ClickableWidget> children;
         private final CommandBlockBlockEntity blockEntity;
diff --git a/src/client/java/works/nuty/calcite/screen/CalciteInputSuggestor.java b/src/client/java/works/nuty/calcite/screen/CalciteInputSuggestor.java
index f813975..be2680c 100644
--- a/src/client/java/works/nuty/calcite/screen/CalciteInputSuggestor.java
+++ b/src/client/java/works/nuty/calcite/screen/CalciteInputSuggestor.java
@@ -34,6 +34,8 @@
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec2f;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 import works.nuty.calcite.widget.CalciteTextFieldWidget;
 
@@ -49,6 +51,7 @@ public class CalciteInputSuggestor {
     private static final Style ERROR_STYLE = Style.EMPTY.withColor(Formatting.RED);
     private static final Style INFO_STYLE = Style.EMPTY.withColor(Formatting.GRAY);
     private static final List<Style> HIGHLIGHT_STYLES = Stream.of(Formatting.AQUA, Formatting.YELLOW, Formatting.GREEN, Formatting.LIGHT_PURPLE, Formatting.GOLD).map(Style.EMPTY::withColor).collect(ImmutableList.toImmutableList());
+    private static final Logger LOGGER = LogManager.getLogger("calcite");
     final MinecraftClient client;
     final CalciteTextFieldWidget textField;
     final TextRenderer textRenderer;
@@ -65,7 +68,7 @@ public class CalciteInputSuggestor {
     private int x;
     private int width;
     @Nullable
-    private ParseResults<CommandSource> parse;
+    public ParseResults<CommandSource> parse;
     @Nullable
     private CompletableFuture<Suggestions> pendingSuggestions;
     private boolean windowActive;
@@ -75,6 +78,7 @@ public CalciteInputSuggestor(MinecraftClient client, Screen owner, CalciteTextFi
         this.client = client;
         this.owner = owner;
         this.textField = textField;
+        this.textField.suggestor = this;
         this.textRenderer = textRenderer;
         this.slashOptional = slashOptional;
         this.suggestingWhenEmpty = suggestingWhenEmpty;
@@ -245,6 +249,10 @@ public void refresh() {
             CommandDispatcher<CommandSource> commandDispatcher = this.client.player.networkHandler.getCommandDispatcher();
             if (this.parse == null) {
                 this.parse = commandDispatcher.parse(stringReader, this.client.player.networkHandler.getCommandSource());
+                var args = this.parse.getContext().getLastChild().getArguments();
+                for (String key : args.keySet()) {
+                    LOGGER.info(key + ": " + args.get(key).getResult());
+                }
             }
             int j = this.suggestingWhenEmpty ? stringReader.getCursor() : 1;
             if (!(i < j || this.window != null && this.completingSuggestions)) {
diff --git a/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java b/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java
index 7de231c..510e588 100644
--- a/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java
+++ b/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java
@@ -1,5 +1,7 @@
 package works.nuty.calcite.widget;
 
+import com.mojang.brigadier.context.ParsedArgument;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.SharedConstants;
@@ -14,16 +16,20 @@
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.sound.SoundManager;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.OrderedText;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
+import net.minecraft.command.CommandSource;
+import net.minecraft.command.argument.ItemStackArgument;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.*;
 import net.minecraft.util.Colors;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.MathHelper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
+import works.nuty.calcite.screen.CalciteInputSuggestor;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
@@ -33,6 +39,7 @@
 public class CalciteTextFieldWidget
         extends ClickableWidget
         implements Drawable {
+    private static final Logger LOGGER = LogManager.getLogger("calcite");
     public static final int DEFAULT_EDITABLE_COLOR = 0xE0E0E0;
     private static final ButtonTextures TEXTURES = new ButtonTextures(new Identifier("widget/text_field"), new Identifier("widget/text_field_highlighted"));
     private static final int VERTICAL_CURSOR_COLOR = -3092272;
@@ -51,6 +58,7 @@ public class CalciteTextFieldWidget
     private int selectionEnd;
     private int editableColor = 0xE0E0E0;
     private int uneditableColor = 0x707070;
+    public CalciteInputSuggestor suggestor;
     @Nullable
     private String suggestion;
     @Nullable
@@ -359,49 +367,91 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt
             Identifier identifier = TEXTURES.get(this.isNarratable(), this.isFocused());
             context.drawGuiTexture(identifier, this.getX(), this.getY(), this.getWidth(), this.getHeight());
         }
-        int i = this.editable ? this.editableColor : this.uneditableColor;
-        int j = this.selectionStart - this.firstCharacterIndex;
-        String string = this.textRenderer.trimToWidth(this.text.substring(this.firstCharacterIndex), this.getInnerWidth());
-        boolean bl = j >= 0 && j <= string.length();
-        boolean bl2 = this.isFocused() && (Util.getMeasuringTimeMs() - this.lastSwitchFocusTime) / 300L % 2L == 0L && bl;
-        int k = this.drawsBackground ? this.getX() + 4 : this.getX();
-        int l = this.drawsBackground ? this.getY() + (this.height - 8) / 2 : this.getY();
-        int m = k;
-        int n = MathHelper.clamp(this.selectionEnd - this.firstCharacterIndex, 0, string.length());
-        if (!string.isEmpty()) {
-            String string2 = bl ? string.substring(0, j) : string;
-            m = context.drawTextWithShadow(this.textRenderer, this.renderTextProvider.apply(string2, this.firstCharacterIndex), m, l, i);
-        }
-        boolean bl3 = this.selectionStart < this.text.length() || this.text.length() >= this.getMaxLength();
-        int o = m;
-        if (!bl) {
-            o = j > 0 ? k + this.width : k;
-        } else if (bl3) {
-            --o;
-            --m;
-        }
-        if (!string.isEmpty() && bl && j < string.length()) {
-            context.drawTextWithShadow(this.textRenderer, this.renderTextProvider.apply(string.substring(j), this.selectionStart), m, l, i);
-        }
-        if (!bl3 && this.suggestion != null) {
+        int color = this.editable ? this.editableColor : this.uneditableColor;
+        int displayedSelectionStart = this.selectionStart - this.firstCharacterIndex;
+        String displayedString = this.textRenderer.trimToWidth(this.text.substring(this.firstCharacterIndex), this.getInnerWidth());
+        boolean isNormalInFront = displayedSelectionStart >= 0 && displayedSelectionStart <= displayedString.length();
+        boolean showCursor = this.isFocused() && (Util.getMeasuringTimeMs() - this.lastSwitchFocusTime) / 300L % 2L == 0L && isNormalInFront;
+        int left = this.drawsBackground ? this.getX() + 4 : this.getX();
+        int top = this.drawsBackground ? this.getY() + (this.height - 8) / 2 : this.getY();
+        int cursor = left;
+        int displayedSelectionEnd = MathHelper.clamp(this.selectionEnd - this.firstCharacterIndex, 0, displayedString.length());
+        if (!displayedString.isEmpty()) {
+            String string2 = isNormalInFront ? displayedString.substring(0, displayedSelectionStart) : displayedString;
+            cursor = context.drawTextWithShadow(this.textRenderer, this.renderTextProvider.apply(string2, this.firstCharacterIndex), cursor, top, color);
+        }
+        boolean isInsideOfText = this.selectionStart < this.text.length() || this.text.length() >= this.getMaxLength();
+        int cursor2 = cursor;
+        if (!isNormalInFront) {
+            cursor2 = displayedSelectionStart > 0 ? left + this.width : left;
+        } else if (isInsideOfText) {
+            --cursor2;
+            --cursor;
+        }
+        if (!displayedString.isEmpty() && isNormalInFront && displayedSelectionStart < displayedString.length()) {
+            context.drawTextWithShadow(this.textRenderer, this.renderTextProvider.apply(displayedString.substring(displayedSelectionStart), this.selectionStart), cursor, top, color);
+        }
+        if (!isInsideOfText && this.suggestion != null) {
             if (this.text.isEmpty()) {
-                ++o;
+                ++cursor2;
             }
-            context.drawTextWithShadow(this.textRenderer, this.suggestion, o - 1, l, Colors.GRAY);
+            context.drawTextWithShadow(this.textRenderer, this.suggestion, cursor2 - 1, top, Colors.GRAY);
         }
-        if (bl2) {
-            if (bl3) {
+        if (showCursor) {
+            if (isInsideOfText) {
                 context.getMatrices().push();
                 context.getMatrices().translate(0, 0, 1);
-                context.fill(RenderLayer.getGui(), o, l - 1, o + 1, l + 1 + this.textRenderer.fontHeight, VERTICAL_CURSOR_COLOR);
+                context.fill(RenderLayer.getGui(), cursor2, top - 1, cursor2 + 1, top + 1 + this.textRenderer.fontHeight, VERTICAL_CURSOR_COLOR);
                 context.getMatrices().pop();
             } else {
-                context.drawTextWithShadow(this.textRenderer, HORIZONTAL_CURSOR, o, l, i);
+                context.drawTextWithShadow(this.textRenderer, HORIZONTAL_CURSOR, cursor2, top, color);
             }
         }
-        if (n != j) {
-            int p = k + this.textRenderer.getWidth(string.substring(0, n));
-            this.drawSelectionHighlight(context, o, l - 1, p - 1, l + 1 + this.textRenderer.fontHeight);
+        if (displayedSelectionEnd != displayedSelectionStart) {
+            int displayedSelectionRight = left + this.textRenderer.getWidth(displayedString.substring(0, displayedSelectionEnd));
+            this.drawSelectionHighlight(context, cursor2, top - 1, displayedSelectionRight - 1, top + 1 + this.textRenderer.fontHeight);
+        }
+        if (isHovered() && suggestor.parse != null) {
+            var args = suggestor.parse.getContext().getLastChild().getArguments();
+
+            for (String key : args.keySet()) {
+                ParsedArgument<CommandSource, ?> arg = args.get(key);
+                int displayedStringLength = displayedString.length();
+                int ds = MathHelper.clamp(arg.getRange().getStart() - firstCharacterIndex, 0, displayedStringLength);
+                int de = MathHelper.clamp(arg.getRange().getEnd() - firstCharacterIndex, 0, displayedStringLength);
+                int hx = left + this.textRenderer.getWidth(displayedString.substring(0, ds));
+                int hy = top - 1;
+                int hw = this.textRenderer.getWidth(displayedString.substring(ds, de));
+                int hh = this.textRenderer.fontHeight + 2;
+
+                if (hx <= mouseX && mouseX <= hx + hw && hy <= mouseY && mouseY <= hy + hh) {
+                    if (isFocused()) {
+                        context.setShaderColor(1, 1, 1, 0.5f);
+                    }
+                    Object result = arg.getResult();
+                    if (result instanceof ItemStackArgument isa) {
+                        try {
+                            ItemStack is = isa.createStack(1, false);
+                            context.drawItemTooltip(this.textRenderer, is, mouseX, mouseY);
+                            context.drawItem(is, mouseX - 8, mouseY - 8);
+                        } catch (CommandSyntaxException e) {
+                            LOGGER.warn("Invalid item stack detected");
+                        }
+                    } else if (result instanceof MutableText mt) {
+                        try {
+                            var text = Texts.parse(null, mt, null, 0);
+                            context.drawTooltip(this.textRenderer, text, mouseX, mouseY);
+                        } catch (CommandSyntaxException e) {
+                            LOGGER.warn("Invalid text component detected");
+                        }
+                    } else {
+                        context.drawTooltip(this.textRenderer, List.of(Text.of(result.getClass().toString()), Text.of(result.toString())), mouseX, mouseY);
+                    }
+                    if (isFocused()) {
+                        context.setShaderColor(1, 1, 1, 1f);
+                    }
+                }
+            }
         }
     }
 

From 4e112e2f675488999d54b32a87c13042f1fd2717 Mon Sep 17 00:00:00 2001
From: Beomjun Kim <nutyworks@gmail.com>
Date: Mon, 18 Mar 2024 15:50:01 +0900
Subject: [PATCH 2/4] Remove log info

---
 .../works/nuty/calcite/screen/CalciteInputSuggestor.java    | 4 ----
 .../works/nuty/calcite/widget/CalciteTextFieldWidget.java   | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/src/client/java/works/nuty/calcite/screen/CalciteInputSuggestor.java b/src/client/java/works/nuty/calcite/screen/CalciteInputSuggestor.java
index be2680c..93488d2 100644
--- a/src/client/java/works/nuty/calcite/screen/CalciteInputSuggestor.java
+++ b/src/client/java/works/nuty/calcite/screen/CalciteInputSuggestor.java
@@ -249,10 +249,6 @@ public void refresh() {
             CommandDispatcher<CommandSource> commandDispatcher = this.client.player.networkHandler.getCommandDispatcher();
             if (this.parse == null) {
                 this.parse = commandDispatcher.parse(stringReader, this.client.player.networkHandler.getCommandSource());
-                var args = this.parse.getContext().getLastChild().getArguments();
-                for (String key : args.keySet()) {
-                    LOGGER.info(key + ": " + args.get(key).getResult());
-                }
             }
             int j = this.suggestingWhenEmpty ? stringReader.getCursor() : 1;
             if (!(i < j || this.window != null && this.completingSuggestions)) {
diff --git a/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java b/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java
index 510e588..8491080 100644
--- a/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java
+++ b/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java
@@ -425,9 +425,6 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt
                 int hh = this.textRenderer.fontHeight + 2;
 
                 if (hx <= mouseX && mouseX <= hx + hw && hy <= mouseY && mouseY <= hy + hh) {
-                    if (isFocused()) {
-                        context.setShaderColor(1, 1, 1, 0.5f);
-                    }
                     Object result = arg.getResult();
                     if (result instanceof ItemStackArgument isa) {
                         try {
@@ -447,9 +444,6 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt
                     } else {
                         context.drawTooltip(this.textRenderer, List.of(Text.of(result.getClass().toString()), Text.of(result.toString())), mouseX, mouseY);
                     }
-                    if (isFocused()) {
-                        context.setShaderColor(1, 1, 1, 1f);
-                    }
                 }
             }
         }

From 91249cf44146a7b9f86d9fb1d9d28ca6303c7657 Mon Sep 17 00:00:00 2001
From: Beomjun Kim <nutyworks@gmail.com>
Date: Mon, 18 Mar 2024 18:54:10 +0900
Subject: [PATCH 3/4] Add nbt tooltip

---
 .../works/nuty/calcite/CalciteModClient.java  |   4 +
 .../calcite/VerticalNbtTextFormatter.java     | 248 ++++++++++++++++++
 .../calcite/screen/CalciteCommandScreen.java  |   3 +
 .../widget/CalciteTextFieldWidget.java        |  20 +-
 4 files changed, 268 insertions(+), 7 deletions(-)
 create mode 100644 src/client/java/works/nuty/calcite/VerticalNbtTextFormatter.java

diff --git a/src/client/java/works/nuty/calcite/CalciteModClient.java b/src/client/java/works/nuty/calcite/CalciteModClient.java
index f4da2a0..b3243d6 100644
--- a/src/client/java/works/nuty/calcite/CalciteModClient.java
+++ b/src/client/java/works/nuty/calcite/CalciteModClient.java
@@ -1,8 +1,12 @@
 package works.nuty.calcite;
 
 import net.fabricmc.api.ClientModInitializer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class CalciteModClient implements ClientModInitializer {
+	public static Logger LOGGER = LogManager.getLogger("calcite");
+
 	@Override
 	public void onInitializeClient() {
 		// This entrypoint is suitable for setting up client-specific logic, such as rendering.
diff --git a/src/client/java/works/nuty/calcite/VerticalNbtTextFormatter.java b/src/client/java/works/nuty/calcite/VerticalNbtTextFormatter.java
new file mode 100644
index 0000000..1452666
--- /dev/null
+++ b/src/client/java/works/nuty/calcite/VerticalNbtTextFormatter.java
@@ -0,0 +1,248 @@
+package works.nuty.calcite;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
+import com.mojang.logging.LogUtils;
+import it.unimi.dsi.fastutil.bytes.ByteCollection;
+import it.unimi.dsi.fastutil.bytes.ByteOpenHashSet;
+import net.minecraft.nbt.*;
+import net.minecraft.nbt.visitor.NbtElementVisitor;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.slf4j.Logger;
+
+import java.util.*;
+import java.util.regex.Pattern;
+
+public class VerticalNbtTextFormatter
+    implements NbtElementVisitor {
+    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final int field_33271 = 8;
+    private static final ByteCollection SINGLE_LINE_ELEMENT_TYPES = new ByteOpenHashSet(Arrays.asList((byte) 1, (byte) 2, (byte) 3, (byte) 4, (byte) 5, (byte) 6));
+    private static final Formatting NAME_COLOR = Formatting.AQUA;
+    private static final Formatting STRING_COLOR = Formatting.GREEN;
+    private static final Formatting NUMBER_COLOR = Formatting.GOLD;
+    private static final Formatting TYPE_SUFFIX_COLOR = Formatting.RED;
+    private static final Pattern SIMPLE_NAME = Pattern.compile("[A-Za-z0-9._+-]+");
+    private static final String KEY_VALUE_SEPARATOR = String.valueOf(':');
+    private static final String ENTRY_SEPARATOR = String.valueOf(',');
+    private static final String SQUARE_OPEN_BRACKET = "[";
+    private static final String SQUARE_CLOSE_BRACKET = "]";
+    private static final String SEMICOLON = ";";
+    private static final String SPACE = " ";
+    private static final String CURLY_OPEN_BRACKET = "{";
+    private static final String CURLY_CLOSE_BRACKET = "}";
+    private final String prefix;
+    private final int indentationLevel;
+    private final List<Text> resultList = new ArrayList<>();
+    private MutableText result = Text.literal("");
+
+    public VerticalNbtTextFormatter(String prefix, int indentationLevel) {
+        this.prefix = prefix;
+        this.indentationLevel = indentationLevel;
+    }
+
+    protected static Text escapeName(String name) {
+        if (SIMPLE_NAME.matcher(name).matches()) {
+            return Text.literal(name).formatted(NAME_COLOR);
+        }
+        String string = NbtString.escape(name);
+        String string2 = string.substring(0, 1);
+        MutableText text = Text.literal(string.substring(1, string.length() - 1)).formatted(NAME_COLOR);
+        return Text.literal(string2).append(text).append(string2);
+    }
+
+    /**
+     * {@return the textified NBT {@code element}}
+     */
+    public List<Text> apply(NbtElement element) {
+        element.accept(this);
+        newLine();
+        return this.resultList;
+    }
+
+    public void newLine() {
+        resultList.add(this.result);
+        this.result = Text.literal("");
+    }
+
+    public void append(String string) {
+        this.result.append(Text.literal(string));
+    }
+
+    public void append(Text text) {
+        this.result.append(text);
+    }
+
+    public void append(List<Text> texts) {
+        if (texts.isEmpty()) return;
+        this.result.append(texts.get(0));
+        for (int i = 1; i < texts.size(); i++) {
+            newLine();
+            this.result.append(texts.get(i));
+        }
+
+    }
+
+    @Override
+    public void visitString(NbtString element) {
+        String string = NbtString.escape(element.asString());
+        String string2 = string.substring(0, 1);
+        MutableText text = Text.literal(string.substring(1, string.length() - 1)).formatted(STRING_COLOR);
+        append(Text.literal(string2).append(text).append(string2));
+    }
+
+    @Override
+    public void visitByte(NbtByte element) {
+        MutableText text = Text.literal("b").formatted(TYPE_SUFFIX_COLOR);
+        append(Text.literal(String.valueOf(element.numberValue())).append(text).formatted(NUMBER_COLOR));
+    }
+
+    @Override
+    public void visitShort(NbtShort element) {
+        MutableText text = Text.literal("s").formatted(TYPE_SUFFIX_COLOR);
+        append(Text.literal(String.valueOf(element.numberValue())).append(text).formatted(NUMBER_COLOR));
+    }
+
+    @Override
+    public void visitInt(NbtInt element) {
+        append(Text.literal(String.valueOf(element.numberValue())).formatted(NUMBER_COLOR));
+    }
+
+    @Override
+    public void visitLong(NbtLong element) {
+        MutableText text = Text.literal("L").formatted(TYPE_SUFFIX_COLOR);
+        append(Text.literal(String.valueOf(element.numberValue())).append(text).formatted(NUMBER_COLOR));
+    }
+
+    @Override
+    public void visitFloat(NbtFloat element) {
+        MutableText text = Text.literal("f").formatted(TYPE_SUFFIX_COLOR);
+        append(Text.literal(String.valueOf(element.floatValue())).append(text).formatted(NUMBER_COLOR));
+    }
+
+    @Override
+    public void visitDouble(NbtDouble element) {
+        MutableText text = Text.literal("d").formatted(TYPE_SUFFIX_COLOR);
+        append(Text.literal(String.valueOf(element.doubleValue())).append(text).formatted(NUMBER_COLOR));
+    }
+
+    @Override
+    public void visitByteArray(NbtByteArray element) {
+        MutableText text = Text.literal("B").formatted(TYPE_SUFFIX_COLOR);
+        MutableText mutableText = Text.literal(SQUARE_OPEN_BRACKET).append(text).append(SEMICOLON);
+        byte[] bs = element.getByteArray();
+        for (int i = 0; i < bs.length; ++i) {
+            MutableText mutableText2 = Text.literal(String.valueOf(bs[i])).formatted(NUMBER_COLOR);
+            mutableText.append(SPACE).append(mutableText2).append(text);
+            if (i == bs.length - 1) continue;
+            mutableText.append(ENTRY_SEPARATOR);
+        }
+        mutableText.append(SQUARE_CLOSE_BRACKET);
+        append(mutableText);
+    }
+
+    @Override
+    public void visitIntArray(NbtIntArray element) {
+        MutableText text = Text.literal("I").formatted(TYPE_SUFFIX_COLOR);
+        MutableText mutableText = Text.literal(SQUARE_OPEN_BRACKET).append(text).append(SEMICOLON);
+        int[] is = element.getIntArray();
+        for (int i = 0; i < is.length; ++i) {
+            mutableText.append(SPACE).append(Text.literal(String.valueOf(is[i])).formatted(NUMBER_COLOR));
+            if (i == is.length - 1) continue;
+            mutableText.append(ENTRY_SEPARATOR);
+        }
+        mutableText.append(SQUARE_CLOSE_BRACKET);
+        append(mutableText);
+    }
+
+    @Override
+    public void visitLongArray(NbtLongArray element) {
+        MutableText text = Text.literal("L").formatted(TYPE_SUFFIX_COLOR);
+        MutableText mutableText = Text.literal(SQUARE_OPEN_BRACKET).append(text).append(SEMICOLON);
+        long[] ls = element.getLongArray();
+        for (int i = 0; i < ls.length; ++i) {
+            MutableText text2 = Text.literal(String.valueOf(ls[i])).formatted(NUMBER_COLOR);
+            mutableText.append(SPACE).append(text2).append(text);
+            if (i == ls.length - 1) continue;
+            mutableText.append(ENTRY_SEPARATOR);
+        }
+        mutableText.append(SQUARE_CLOSE_BRACKET);
+        append(mutableText);
+    }
+
+    @Override
+    public void visitList(NbtList element) {
+        if (element.isEmpty()) {
+            append(Text.literal("[]"));
+            newLine();
+            return;
+        }
+        if (SINGLE_LINE_ELEMENT_TYPES.contains(element.getHeldType()) && element.size() <= 8) {
+            String string = ENTRY_SEPARATOR + SPACE;
+            append(Text.literal(SQUARE_OPEN_BRACKET));
+            for (int i = 0; i < element.size(); ++i) {
+                if (i != 0) {
+                    append(string);
+                }
+                append(new VerticalNbtTextFormatter(this.prefix, this.indentationLevel).apply(element.get(i)));
+            }
+            append(SQUARE_CLOSE_BRACKET);
+            return;
+        }
+        append(Text.literal(SQUARE_OPEN_BRACKET));
+        if (!this.prefix.isEmpty()) {
+            newLine();
+        }
+        for (int j = 0; j < element.size(); ++j) {
+            append(Text.literal(Strings.repeat(this.prefix, this.indentationLevel + 1)));
+            append(new VerticalNbtTextFormatter(this.prefix, this.indentationLevel + 1).apply(element.get(j)));
+            if (j != element.size() - 1) {
+                append(ENTRY_SEPARATOR);
+                newLine();
+            }
+        }
+        newLine();
+        append(Strings.repeat(this.prefix, this.indentationLevel));
+        append(SQUARE_CLOSE_BRACKET);
+    }
+
+    @Override
+    public void visitCompound(NbtCompound compound) {
+        if (compound.isEmpty()) {
+            append(Text.literal("{}"));
+            return;
+        }
+        append(Text.literal(CURLY_OPEN_BRACKET));
+        Collection<String> collection = compound.getKeys();
+        if (LOGGER.isDebugEnabled()) {
+            ArrayList<String> list = Lists.newArrayList(compound.getKeys());
+            Collections.sort(list);
+            collection = list;
+        }
+        if (!this.prefix.isEmpty()) {
+            newLine();
+        }
+        Iterator iterator = collection.iterator();
+        while (iterator.hasNext()) {
+            String string = (String) iterator.next();
+            append(Text.literal(Strings.repeat(this.prefix, this.indentationLevel + 1)).append(VerticalNbtTextFormatter.escapeName(string)).append(KEY_VALUE_SEPARATOR).append(SPACE));
+            append(new VerticalNbtTextFormatter(this.prefix, this.indentationLevel + 1).apply(compound.get(string)));
+            if (iterator.hasNext()) {
+                append(ENTRY_SEPARATOR);
+                newLine();
+            }
+        }
+        if (!this.prefix.isEmpty()) {
+            newLine();
+            append(Strings.repeat(this.prefix, this.indentationLevel));
+        }
+        append(CURLY_CLOSE_BRACKET);
+    }
+
+    @Override
+    public void visitEnd(NbtEnd element) {
+        this.result = Text.literal("");
+    }
+}
diff --git a/src/client/java/works/nuty/calcite/screen/CalciteCommandScreen.java b/src/client/java/works/nuty/calcite/screen/CalciteCommandScreen.java
index 6ce4de1..93f3ea1 100644
--- a/src/client/java/works/nuty/calcite/screen/CalciteCommandScreen.java
+++ b/src/client/java/works/nuty/calcite/screen/CalciteCommandScreen.java
@@ -231,8 +231,11 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
             commandSuggestorRenderer = null;
         }
 
+        context.getMatrices().push();
+        context.getMatrices().translate(0, 0, 1);
         doneButton.render(context, mouseX, mouseY, delta);
         cancelButton.render(context, mouseX, mouseY, delta);
+        context.getMatrices().pop();
     }
 
     @Environment(EnvType.CLIENT)
diff --git a/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java b/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java
index 8491080..f16f9cc 100644
--- a/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java
+++ b/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java
@@ -19,14 +19,15 @@
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.argument.ItemStackArgument;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
 import net.minecraft.text.*;
 import net.minecraft.util.Colors;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.MathHelper;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
+import works.nuty.calcite.CalciteModClient;
+import works.nuty.calcite.VerticalNbtTextFormatter;
 import works.nuty.calcite.screen.CalciteInputSuggestor;
 
 import java.util.List;
@@ -39,7 +40,6 @@
 public class CalciteTextFieldWidget
         extends ClickableWidget
         implements Drawable {
-    private static final Logger LOGGER = LogManager.getLogger("calcite");
     public static final int DEFAULT_EDITABLE_COLOR = 0xE0E0E0;
     private static final ButtonTextures TEXTURES = new ButtonTextures(new Identifier("widget/text_field"), new Identifier("widget/text_field_highlighted"));
     private static final int VERTICAL_CURSOR_COLOR = -3092272;
@@ -424,7 +424,9 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt
                 int hw = this.textRenderer.getWidth(displayedString.substring(ds, de));
                 int hh = this.textRenderer.fontHeight + 2;
 
-                if (hx <= mouseX && mouseX <= hx + hw && hy <= mouseY && mouseY <= hy + hh) {
+                if (Screen.hasControlDown() && hx <= mouseX && mouseX <= hx + hw && hy <= mouseY && mouseY <= hy + hh) {
+                    context.getMatrices().push();
+                    context.getMatrices().translate(0, 0, 2);
                     Object result = arg.getResult();
                     if (result instanceof ItemStackArgument isa) {
                         try {
@@ -432,18 +434,22 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt
                             context.drawItemTooltip(this.textRenderer, is, mouseX, mouseY);
                             context.drawItem(is, mouseX - 8, mouseY - 8);
                         } catch (CommandSyntaxException e) {
-                            LOGGER.warn("Invalid item stack detected");
+                            CalciteModClient.LOGGER.warn("Invalid item stack detected");
                         }
                     } else if (result instanceof MutableText mt) {
                         try {
                             var text = Texts.parse(null, mt, null, 0);
                             context.drawTooltip(this.textRenderer, text, mouseX, mouseY);
                         } catch (CommandSyntaxException e) {
-                            LOGGER.warn("Invalid text component detected");
+                            CalciteModClient.LOGGER.warn("Invalid text component detected");
                         }
+                    } else if (result instanceof NbtCompound nbt) {
+                        List<Text> text = new VerticalNbtTextFormatter("  ", 0).apply(nbt);
+                        context.drawTooltip(this.textRenderer, text, mouseX, mouseY);
                     } else {
-                        context.drawTooltip(this.textRenderer, List.of(Text.of(result.getClass().toString()), Text.of(result.toString())), mouseX, mouseY);
+//                        context.drawTooltip(this.textRenderer, List.of(Text.of(result.getClass().toString()), Text.of(result.toString())), mouseX, mouseY);
                     }
+                    context.getMatrices().pop();
                 }
             }
         }

From 6898e7cb1e3ecf2f15131a7ee938df0dcac6ab2a Mon Sep 17 00:00:00 2001
From: Beomjun Kim <nutyworks@gmail.com>
Date: Mon, 18 Mar 2024 18:55:32 +0900
Subject: [PATCH 4/4] Set version to 0.2.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7ec5b1b..254bff1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=1.20.4+build.1
 loader_version=0.15.0
 
 # Mod Properties
-mod_version=0.2.0
+mod_version=0.2.1
 maven_group=works.nuty
 archives_base_name=calcite