Text Block UI Rework & Abstracting - Multiline Editing, Tab Ribbon UI, & Other Goodies

src/main/java/dev/hephaestus/glowcase/block/entity/PopupBlockEntity.java

@@ -15,12 +15,12 @@
 import net.minecraft.world.level.storage.ValueOutput;
 
 public class PopupBlockEntity extends GlowcaseBlockEntity {
-	public static final NodeParser PARSER = TagParser.DEFAULT;
 	public String title = "";
 	public List<Component> lines = new ArrayList<>();
 	public TextBlockEntity.TextAlignment textAlignment = TextBlockEntity.TextAlignment.CENTER;
 	public int color = 0xFFFFFFFF;
 	public boolean renderDirty = true;
+	public boolean viewScreenTitle = true;
 
 	public PopupBlockEntity(BlockPos pos, BlockState state) {
 		super(Glowcase.POPUP_BLOCK_ENTITY.get(), pos, state);
@@ -32,6 +32,7 @@ protected void saveAdditional(ValueOutput view) {
 		super.saveAdditional(view);
 
 		view.putString("title", this.title);
+		view.putBoolean("view_screen_title", this.viewScreenTitle);
 		view.putInt("color", this.color);
 
 		view.store("text_alignment", TextBlockEntity.TextAlignment.CODEC, this.textAlignment);
@@ -44,6 +45,7 @@ protected void loadAdditional(ValueInput view) {
 		super.loadAdditional(view);
 
 		this.title = view.getStringOr("title", "");
+		this.viewScreenTitle = view.getBooleanOr("view_screen_title", true);
 		this.color = view.getIntOr("color", 0xFFFFFF);
 
 		this.textAlignment = view.read("text_alignment", TextBlockEntity.TextAlignment.CODEC).orElse(TextBlockEntity.TextAlignment.CENTER);
@@ -52,39 +54,4 @@ protected void loadAdditional(ValueInput view) {
 
 		this.renderDirty = true;
 	}
-
-	public String getRawLine(int i) {
-		var line = this.lines.get(i);
-
-		if (line.getStyle() == null) {
-			return line.getString();
-		}
-
-		var insert = line.getStyle().getInsertion();
-
-		if (insert == null) {
-			return line.getString();
-		}
-		return insert;
-	}
-
-	public void addRawLine(int i, String string) {
-		var parsed = PARSER.parseComponent(string, ParserContext.of());
-
-		if (parsed.getString().equals(string)) {
-			this.lines.add(i, Component.literal(string));
-		} else {
-			this.lines.add(i, Component.empty().append(parsed).setStyle(Style.EMPTY.withInsertion(string)));
-		}
-	}
-
-	public void setRawLine(int i, String string) {
-		var parsed = PARSER.parseComponent(string, ParserContext.of());
-
-		if (parsed.getString().equals(string)) {
-			this.lines.set(i, Component.literal(string));
-		} else {
-			this.lines.set(i, Component.empty().append(parsed).setStyle(Style.EMPTY.withInsertion(string)));
-		}
-	}
 }

src/main/java/dev/hephaestus/glowcase/block/entity/TextBlockEntity.java

@@ -18,23 +18,25 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.ValueInput;
 import net.minecraft.world.level.storage.ValueOutput;
+import net.minecraft.world.phys.Vec3;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class TextBlockEntity extends GlowcaseBlockEntity {
-	public static final NodeParser PARSER = TagParser.DEFAULT;
-
 	public static final int PLATE_BACKGROUND = 0x44000000;
 
 	public List<Component> lines = new ArrayList<>();
+	// TODO (AC) - Anchor related field changes/additions (don't forget to save & load them!)
 	public TextAlignment textAlignment = TextAlignment.CENTER;
 	public HorizontalAlignment horizontalAlignment = HorizontalAlignment.CENTER;
 	public ZOffset zOffset = ZOffset.CENTER;
 	public boolean shadow = true;
 	public float scale = 1F;
 	public int color = ColorUtil.WHITE;
 	public int backgroundColor = 0;
+	public Vec3 offset = Vec3.ZERO;
+	public Vec3 rotation = Vec3.ZERO; // Yaw, pitch, roll
 
 	public TextBlockEntity(BlockPos pos, BlockState state) {
 		super(Glowcase.TEXT_BLOCK_ENTITY.get(), pos, state);
@@ -54,7 +56,10 @@ protected void saveAdditional(ValueOutput view) {
 		view.store("z_offset", ZOffset.CODEC, this.zOffset);
 		view.putBoolean("shadow", this.shadow);
 
-		view.store("lines", ComponentSerialization.CODEC.listOf(), lines);
+		view.store("lines", ComponentSerialization.CODEC.listOf(), this.lines);
+
+		view.store("offset", Vec3.CODEC, this.offset);
+		view.store("rotation", Vec3.CODEC, this.rotation);
 	}
 
 	@Override
@@ -69,53 +74,24 @@ protected void loadAdditional(ValueInput view) {
 
 		this.backgroundColor = view.getIntOr("background_color", 0);
 		this.shadow = view.getBooleanOr("shadow", true);
+		// TODO (AC) - Handle loading old data alignment and converting it into new justify/anchor/whatever data
 		this.textAlignment = view.read("text_alignment", TextAlignment.CODEC).orElse(TextAlignment.CENTER);
 		this.horizontalAlignment = view.read("horizontal_alignment", HorizontalAlignment.CODEC).orElse(HorizontalAlignment.CENTER);
 		this.zOffset = view.read("z_offset", ZOffset.CODEC).orElse(ZOffset.CENTER);
 		this.lines = new ArrayList<>(view.read("lines", ComponentSerialization.CODEC.listOf()).orElseGet(List::of));
-		this.rebake(false);
-	}
-
-	public String getRawLine(int i) {
-		var line = this.lines.get(i);
-
-		if (line.getStyle() == null) {
-			return line.getString();
-		}
-
-		var insert = line.getStyle().getInsertion();
 
-		if (insert == null) {
-			return line.getString();
-		}
-		return insert;
-	}
-
-	public void addRawLine(int i, String string) {
-		var parsed = PARSER.parseComponent(string, ParserContext.of());
-
-		if (parsed.getString().equals(string)) {
-			this.lines.add(i, Component.literal(string));
-		} else {
-			this.lines.add(i, Component.empty().append(parsed).setStyle(Style.EMPTY.withInsertion(string)));
-		}
-	}
+		this.offset = view.read("offset", Vec3.CODEC).orElse(Vec3.ZERO);
+		this.rotation = view.read("rotation", Vec3.CODEC).orElse(Vec3.ZERO);
 
-	public void setRawLine(int i, String string) {
-		var parsed = PARSER.parseComponent(string, ParserContext.of());
-
-		if (parsed.getString().equals(string)) {
-			this.lines.set(i, Component.literal(string));
-		} else {
-			this.lines.set(i, Component.empty().append(parsed).setStyle(Style.EMPTY.withInsertion(string)));
-		}
+		this.rebake(false);
 	}
 
 	public void rebake(boolean immediate) {
 		if (!this.hasLevel() || !this.getLevel().isClientSide()) return;
 		this.getLevel().sendBlockUpdated(this.getBlockPos(), this.getBlockState(), this.getBlockState(), immediate ? Block.UPDATE_IMMEDIATE : 0);
 	}
 
+	// TODO (AC) - Rename into TextJustify?
 	public enum TextAlignment implements StringRepresentable {
 		LEFT,
 		CENTER,
@@ -133,6 +109,8 @@ public String getSerializedName() {
 		}
 	}
 
+	// TODO (AC Idea) - Rename to "ZAnchor" to provide a clear distinction between xyz offset and this?
+	//  If done, fields/variables and translations for the edit screen should be updated
 	public enum ZOffset implements StringRepresentable {
 		FRONT, CENTER, BACK;
 
@@ -144,6 +122,7 @@ public String getSerializedName() {
 		}
 	}
 
+	@Deprecated
 	public enum HorizontalAlignment implements StringRepresentable {
 		LEFT, CENTER, RIGHT;
 
@@ -155,4 +134,41 @@ public String getSerializedName() {
 			return name().toLowerCase();
 		}
 	}
+
+	public enum Anchor implements StringRepresentable {
+		TOP_LEFT(-1, 1), TOP(0, 1), TOP_RIGHT(1, 1),
+		MIDDLE_LEFT(-1, 0), MIDDLE(0, 0), MIDDLE_RIGHT(1, 0),
+		BOTTOM_LEFT(-1, -1), BOTTOM(0, -1), BOTTOM_RIGHT(1, -1);
+
+		public static final Codec<Anchor> CODEC = StringRepresentable.fromEnum(Anchor::values);
+		public static final StreamCodec<ByteBuf, Anchor> STREAM_CODEC = ByteBufCodecs.BYTE.map(index -> Anchor.values()[index], anchor -> (byte) anchor.ordinal());
+
+		public static Anchor fromHorizontalAlignment(HorizontalAlignment horizontalAlignment) {
+			return switch (horizontalAlignment) {
+				case LEFT -> MIDDLE_LEFT;
+				case RIGHT -> MIDDLE_RIGHT;
+				default -> MIDDLE;
+			};
+		}
+
+		private final int x;
+		private final int y;
+		Anchor(int x, int y) {
+			this.x = x;
+			this.y = y;
+		}
+
+		public int getX() {
+			return this.x;
+		}
+
+		public int getY() {
+			return this.y;
+		}
+
+		@Override
+		public String getSerializedName() {
+			return this.name().toLowerCase();
+		}
+	}
 }

src/main/java/dev/hephaestus/glowcase/client/gui/screen/ingame/ColorPickerIncludedScreen.java

@@ -1,11 +1,81 @@
 package dev.hephaestus.glowcase.client.gui.screen.ingame;
 
-import dev.hephaestus.glowcase.client.gui.widget.ingame.ColorPickerWidget;
-import net.minecraft.ChatFormatting;
+import dev.hephaestus.glowcase.client.gui.widget.ingame.color.picker.ColorPickerWidget;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.input.KeyEvent;
+import net.minecraft.client.input.MouseButtonEvent;
+import org.lwjgl.glfw.GLFW;
 
+/**
+ * Main interface for any Screen wishing to implement a {@link ColorPickerWidget}.<br><br>
+ * Each ColorPickerIncludedScreen has *one* Color Picker widget which gets shared among all things using it.<br>
+ * Steps for adding a Color Picker to a screen:
+ * <ol type="0">
+ *     <li>Implement this interface, and return a private ColorPickerWidget in {@link ColorPickerIncludedScreen#getColorPickerWidget()}.</li>
+ *     <li>Initialize your ColorPickerWidget in {@link Screen#init()} via {@link ColorPickerWidget#builder(ColorPickerIncludedScreen)}. You do *not* need to add it as a renderableWidget.</li>
+ *     <li>Include {@link ColorPickerIncludedScreen#extractColorPicker(GuiGraphicsExtractor, int, int, float)} at the very bottom of {@link Screen#extractRenderState(GuiGraphicsExtractor, int, int, float)} to ensure it renders atop of everything else.</li>
+ *     <li>Include {@link ColorPickerIncludedScreen#mouseClickedColorPicker(MouseButtonEvent, boolean)} at the very top of {@link Screen#mouseClicked(MouseButtonEvent, boolean)}, return true if color picker was clicked, otherwise continue with method.</li>
+ *     <li>Include {@link ColorPickerIncludedScreen#keyPressedColorPicker(KeyEvent)} at the very top of {@link Screen#keyPressed(KeyEvent)}, return true if color picker key pressed, otherwise continue with method.</li>
+ *     <li>Booyah!</li>
+ * </ol>
+ * @author Superkat32
+ */
 public interface ColorPickerIncludedScreen {
-	ColorPickerWidget colorPickerWidget();
-	void toggleColorPicker(boolean active);
-	void insertHexTag(String hex);
-	void insertFormattingTag(ChatFormatting formatting);
+	ColorPickerWidget getColorPickerWidget();
+
+	default ColorPickerWidget createColorPickerWidget() {
+		return ColorPickerWidget.builder(this).build();
+	}
+
+	default void extractColorPicker(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
+		this.getColorPickerWidget().extractRenderState(graphics, mouseX, mouseY, delta);
+	}
+
+	default boolean mouseClickedColorPicker(MouseButtonEvent event, boolean doubleClick) {
+		double mouseX = event.x();
+		double mouseY = event.y();
+		ColorPickerWidget colorPickerWidget = this.getColorPickerWidget();
+
+		if (colorPickerWidget.isActive() && colorPickerWidget.visible) {
+			if (colorPickerWidget.isMouseOver(mouseX, mouseY)) {
+				colorPickerWidget.mouseClicked(event, doubleClick);
+				Screen self = (Screen) this;
+				self.setFocused(colorPickerWidget);
+				self.setDragging(true);
+				return true;
+			} else if (colorPickerWidget.targetElement == null || !colorPickerWidget.targetElement.isMouseOver(mouseX, mouseY)) {
+				this.hideColorPickerWidget();
+			}
+		}
+		return false;
+	}
+
+	default boolean keyPressedColorPicker(KeyEvent event) {
+		int keyCode = event.key();
+		ColorPickerWidget colorPickerWidget = this.getColorPickerWidget();
+		if (colorPickerWidget.isActive()) {
+			Screen self = (Screen) this;
+			switch (keyCode) {
+				case GLFW.GLFW_KEY_ENTER, GLFW.GLFW_KEY_KP_ENTER -> colorPickerWidget.confirm();
+				case GLFW.GLFW_KEY_ESCAPE -> colorPickerWidget.cancel();
+				default -> {
+					GuiEventListener pickerTarget = colorPickerWidget.targetElement;
+					if (pickerTarget != null) {
+						self.setFocused(pickerTarget);
+						pickerTarget.keyPressed(event);
+						return true;
+					}
+				}
+			}
+			self.setFocused(null);
+			return true;
+		}
+		return false;
+	}
+
+	default void hideColorPickerWidget() {
+		this.getColorPickerWidget().hide();
+	}
 }

src/main/java/dev/hephaestus/glowcase/client/gui/screen/ingame/ItemAcceptorBlockEditScreen.java

@@ -34,8 +34,8 @@ public void init() {
 			this.itemWidget.setValue((this.blockEntity.isItemTag ? "#" : "") + item);
 		}
 		this.itemWidget.setHint(TextUtils.placeholder("gui.glowcase.item_or_tag"));
-		this.itemWidget.setFilter((currentValue, newChar, cursorPos) -> {
-			if (!InputFilters.assertOptionalPrefix('#', currentValue, newChar, cursorPos)) return false;
+		this.itemWidget.setFilter((currentValue, newChar, cursorPos, highlightPos) -> {
+			if (!InputFilters.assertOptionalPrefix('#', currentValue, newChar, cursorPos, highlightPos)) return false;
 			if (newChar == '#' && cursorPos == 0) return true;
 
 			return this.isValidCharacterForName(currentValue, newChar, cursorPos);