Skip to content

Add focus mode and script renaming to the scripting terminal #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubensworks merged 5 commits into from
Oct 19, 2026
Merged

Add focus mode and script renaming to the scripting terminal #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5fe10e
Show full script paths when hovering the script list
claude Oct 17, 2026
d88a8f3
Allow renaming scripts in the scripting terminal
claude Oct 17, 2026
bfc3760
Add a focus mode to enlarge the script editor
claude Oct 18, 2026
973ac6e
Warn that renaming a script breaks its variable cards
claude Oct 19, 2026
48613ed
Add a rebindable hotkey to enlarge the script editor
claude Oct 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 57 additions & 1 deletion src/main/java/org/cyclops/integratedscripting/client/gui/component/input/WidgetDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.narration.NarratedElementType;
import net.minecraft.client.gui.narration.NarrationElementOutput;
Expand All @@ -14,8 +15,11 @@
import net.minecraft.util.FormattedCharSequence;
import org.cyclops.cyclopscore.client.gui.component.button.ButtonText;
import org.cyclops.cyclopscore.helper.Helpers;
import org.cyclops.cyclopscore.helper.RenderHelpers;
import org.cyclops.integratedscripting.Reference;

import javax.annotation.Nullable;

/**
* Shows a confirm/cancel dialog
* @author rubensworks
Expand All @@ -32,10 +36,23 @@ public class WidgetDialog extends AbstractWidget implements GuiEventListener {
private final Component message;
private final ButtonText buttonConfirm;
private final ButtonText buttonCancel;
@Nullable
private final EditBox input;
@Nullable
private Component warning;

public WidgetDialog(Font font, int x, int y, Screen parent,
Component title, Component message, Component confirm, Component cancel,
Button.OnPress confirmCallback, Button.OnPress cancelCallback) {
this(font, x, y, parent, title, message, confirm, cancel, confirmCallback, cancelCallback, null);
}

/**
* @param inputValue If not null, a text input is shown with this initial value.
*/
public WidgetDialog(Font font, int x, int y, Screen parent,
Component title, Component message, Component confirm, Component cancel,
Button.OnPress confirmCallback, Button.OnPress cancelCallback, @Nullable String inputValue) {
super(x, y, WIDTH, HEIGHT, message);
this.font = font;
this.parent = parent;
Expand All @@ -44,6 +61,21 @@ public WidgetDialog(Font font, int x, int y, Screen parent,

this.buttonConfirm = new ButtonText(x + 50, y + HEIGHT - 15 - 5, 50, 15, confirm, confirm, confirmCallback, true);
this.buttonCancel = new ButtonText(x + WIDTH - 50 - 50, y + HEIGHT - 15 - 5, 50, 15, cancel, cancel, cancelCallback, true);
if (inputValue != null) {
this.input = new EditBox(font, x + 10, y + 31, WIDTH - 20, 12, message);
this.input.setMaxLength(256);
this.input.setValue(inputValue);
this.input.setFocused(true);
} else {
this.input = null;
}
}

/**
* @param warning A short warning to show below the input, or null.
*/
public void setWarning(@Nullable Component warning) {
this.warning = warning;
}

protected void drawBackground(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
Expand All @@ -65,16 +97,40 @@ protected void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, flo

guiGraphics.drawCenteredString(font, title, this.getX() + this.width / 2, this.getY() + 4, 16777215);
FormattedCharSequence formattedcharsequence = message.getVisualOrderText();
guiGraphics.drawString(font, message, (this.getX() + this.width / 2 - font.width(formattedcharsequence) / 2), (this.getY() + 25), 4210752, false);
guiGraphics.drawString(font, message, (this.getX() + this.width / 2 - font.width(formattedcharsequence) / 2), (this.getY() + (this.input != null ? 19 : 25)), 4210752, false);
if (this.input != null) {
this.input.render(guiGraphics, mouseX, mouseY, partialTicks);
}
if (this.warning != null) {
// Scaled down to fit between the input and the buttons, and further for long translations
String warning = this.warning.getString();
float scale = Math.min(0.5F, (float) (WIDTH - 20) / font.width(warning));
RenderHelpers.drawScaledString(guiGraphics, font, warning, this.getX() + this.width / 2 - (int) (font.width(warning) * scale / 2),
this.getY() + 45, scale, Helpers.RGBToInt(140, 30, 30), false, Font.DisplayMode.NORMAL);
}
}

@Override
public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
return this.buttonConfirm.mouseClicked(mouseX, mouseY, mouseButton)
|| this.buttonCancel.mouseClicked(mouseX, mouseY, mouseButton)
|| (this.input != null && this.input.mouseClicked(mouseX, mouseY, mouseButton))
|| super.mouseClicked(mouseX, mouseY, mouseButton);
}

@Nullable
public EditBox getInput() {
return input;
}

public void confirm() {
this.buttonConfirm.onPress();
}

public void cancel() {
this.buttonCancel.onPress();
}

@Override
protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
narrationElementOutput.add(NarratedElementType.TITLE, message);
Expand Down
Loading
Loading