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

src/main/java/dev/hephaestus/glowcase/block/RecipeBlock.java

@@ -4,7 +4,6 @@
 import com.mojang.serialization.MapCodec;
 import dev.hephaestus.glowcase.Glowcase;
 import dev.hephaestus.glowcase.block.entity.RecipeBlockEntity;
-import dev.hephaestus.glowcase.block.entity.TextBlockEntity;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
@@ -76,7 +75,7 @@ public void appendTooltip(ItemStack stack, Item.TooltipContext context, TooltipD
 	public VoxelShape targetedOutlineShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
 		if (!(world.getBlockEntity(pos) instanceof RecipeBlockEntity be)) return Shapes.empty();
 		float rotation = -(state.getValue(BlockStateProperties.ROTATION_16) * 360) / 16.0F;
-		Vector3f offset = new Vector3f(0, 0, be.zOffset == TextBlockEntity.ZOffset.CENTER ? 0.01F : be.zOffset == TextBlockEntity.ZOffset.FRONT ? 0.4F : -0.4F).rotate(Axis.YP.rotationDegrees(rotation));
+		Vector3f offset = new Vector3f(0, 0, be.zOffset.offset).rotate(Axis.YP.rotationDegrees(rotation));
 		return HALF_CUBED.move(offset.x, offset.y, offset.z);
 	}
 

src/main/java/dev/hephaestus/glowcase/block/TextBlock.java

@@ -3,6 +3,7 @@
 import com.mojang.serialization.MapCodec;
 import dev.hephaestus.glowcase.Glowcase;
 import dev.hephaestus.glowcase.block.entity.TextBlockEntity;
+import dev.hephaestus.glowcase.util.ZOffset;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.component.DataComponents;
@@ -44,12 +45,11 @@ public boolean openEditScreen(BlockPos pos) {
 	public void setPlacedBy(Level world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
 
 		if (world.getBlockEntity(pos) instanceof TextBlockEntity be) { // Wish we had ctx.side right now...
-			if (be.zOffset == TextBlockEntity.ZOffset.CENTER && Math.abs(placer.getXRot()) < 30) {
-				be.zOffset = TextBlockEntity.ZOffset.BACK;
-			} else if (be.zOffset == TextBlockEntity.ZOffset.BACK && Math.abs(placer.getXRot()) > 60) {
-				be.zOffset = TextBlockEntity.ZOffset.CENTER;
+			final var offset = be.offset;
+			be.offset = ZOffset.adjustPlacement(be.offset, placer.getXRot());
+			if (offset != be.offset) {
+				be.setChanged();
 			}
-			be.setChanged();
 		}
 	}
 

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

@@ -1,26 +1,24 @@
 package dev.hephaestus.glowcase.block.entity;
 
 import dev.hephaestus.glowcase.Glowcase;
-import eu.pb4.placeholders.api.ParserContext;
-import eu.pb4.placeholders.api.parsers.NodeParser;
-import eu.pb4.placeholders.api.parsers.TagParser;
-import java.util.ArrayList;
-import java.util.List;
+import dev.hephaestus.glowcase.util.TextJustify;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ComponentSerialization;
-import net.minecraft.network.chat.Style;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.ValueInput;
 import net.minecraft.world.level.storage.ValueOutput;
 
+import java.util.ArrayList;
+import java.util.List;
+
 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 TextJustify textAlignment = TextJustify.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,9 +30,10 @@ 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);
+		view.store("text_alignment", TextJustify.CODEC, this.textAlignment);
 
 		view.store("lines", ComponentSerialization.CODEC.listOf(), this.lines);
 	}
@@ -44,47 +43,13 @@ 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);
+		this.textAlignment = view.read("text_alignment", TextJustify.CODEC).orElse(TextJustify.CENTER);
 
 		this.lines = new ArrayList<>(view.read("lines", ComponentSerialization.CODEC.listOf()).orElse(List.of(Component.empty())));
 
 		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/RecipeBlockEntity.java

@@ -3,6 +3,7 @@
 import dev.hephaestus.glowcase.Glowcase;
 import dev.hephaestus.glowcase.client.GlowcaseClient;
 import dev.hephaestus.glowcase.client.util.RRVClientUtils;
+import dev.hephaestus.glowcase.util.ZOffset;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.core.BlockPos;
@@ -14,7 +15,7 @@
 
 public class RecipeBlockEntity extends GlowcaseBlockEntity {
 	public String recipe = "diamond_sword";
-	public TextBlockEntity.ZOffset zOffset = TextBlockEntity.ZOffset.CENTER;
+	public ZOffset zOffset = ZOffset.CENTER;
 
 	//TODO: maybe move XYZ rotation to nbt? or use vec2f
 	public float rotationX = 0f;
@@ -42,7 +43,7 @@ protected void saveAdditional(ValueOutput view) {
 		super.saveAdditional(view);
 
 		view.putString("recipe", this.recipe);
-		view.store("z_offset", TextBlockEntity.ZOffset.CODEC, this.zOffset);
+		view.store("z_offset", ZOffset.CODEC, this.zOffset);
 		view.putFloat("rotationX", this.rotationX);
 		view.putFloat("rotationY", this.rotationY);
 	}
@@ -57,7 +58,7 @@ protected void loadAdditional(ValueInput view) {
 		super.loadAdditional(view);
 
 		this.recipe = view.getStringOr("recipe", "diamond_sword");
-		this.zOffset = view.read("z_offset", TextBlockEntity.ZOffset.CODEC).orElse(TextBlockEntity.ZOffset.CENTER);
+		this.zOffset = view.read("z_offset", ZOffset.CODEC).orElse(ZOffset.CENTER);
 		this.rotationX = view.getFloatOr("rotationX", 0);
 		this.rotationY = view.getFloatOr("rotationY", 0);
 	}

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

@@ -1,9 +1,7 @@
 package dev.hephaestus.glowcase.block.entity;
 
 import dev.hephaestus.glowcase.Glowcase;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Optional;
+import dev.hephaestus.glowcase.util.ZOffset;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.Identifier;
@@ -12,12 +10,15 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.ValueInput;
 import net.minecraft.world.level.storage.ValueOutput;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
 
 public class SpriteBlockEntity extends GlowcaseBlockEntity {
 	protected String sprite = "arrow";
 	protected @Nullable ItemStack renderItem = null;
 	public int rotation = 0;
-	public TextBlockEntity.ZOffset zOffset = TextBlockEntity.ZOffset.BACK;
+	public ZOffset zOffset = ZOffset.BACK;
 	public int color = 0xFFFFFF;
 	public float scale = 1;
 
@@ -50,7 +51,7 @@ protected void saveAdditional(ValueOutput view) {
 
 		view.putString("sprite", this.sprite);
 		view.putInt("rotation", this.rotation);
-		view.store("z_offset", TextBlockEntity.ZOffset.CODEC, this.zOffset);
+		view.store("z_offset", ZOffset.CODEC, this.zOffset);
 		view.putInt("color", this.color);
 		view.putFloat("scale", this.scale);
 	}
@@ -61,7 +62,7 @@ protected void loadAdditional(ValueInput view) {
 
 		setSprite(view.getStringOr("sprite", "arrow"));
 		this.rotation = view.getIntOr("rotation", 0);
-		this.zOffset = view.read("z_offset", TextBlockEntity.ZOffset.CODEC).orElse(TextBlockEntity.ZOffset.BACK);
+		this.zOffset = view.read("z_offset", ZOffset.CODEC).orElse(ZOffset.BACK);
 		this.color = view.getIntOr("color", 0xFFFFFF);
 		this.scale = view.getFloatOr("scale", 1);
 	}