Skip to content
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

Add more center options to the Text Block #76

Merged
merged 2 commits into from
Apr 3, 2025
+13 −9
Merged

Add more center options to the Text Block #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e74f5c
Add CENTER_LEFT and CENTER_RIGHT
dooji2 Mar 15, 2025
bad562c
Fix the math
dooji2 Mar 15, 2025
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
2 changes: 1 addition & 1 deletion src/main/java/dev/hephaestus/glowcase/block/entity/TextBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void setRawLine(int i, String string) {
}

public enum TextAlignment {
LEFT, CENTER, RIGHT
LEFT, CENTER, CENTER_LEFT, CENTER_RIGHT, RIGHT
}

public enum ZOffset {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/dev/hephaestus/glowcase/client/gui/screen/ingame/PopupBlockEditScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public void init() {
this.changeAlignment = ButtonWidget.builder(Text.stringifiedTranslatable("gui.glowcase.alignment", this.popupBlockEntity.textAlignment), action -> {
switch (popupBlockEntity.textAlignment) {
case LEFT -> popupBlockEntity.textAlignment = TextBlockEntity.TextAlignment.CENTER;
case CENTER -> popupBlockEntity.textAlignment = TextBlockEntity.TextAlignment.RIGHT;
case CENTER, CENTER_LEFT, CENTER_RIGHT -> popupBlockEntity.textAlignment = TextBlockEntity.TextAlignment.RIGHT;
case RIGHT -> popupBlockEntity.textAlignment = TextBlockEntity.TextAlignment.LEFT;
}
this.popupBlockEntity.renderDirty = true;
Expand Down Expand Up @@ -115,7 +115,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
int lineWidth = this.textRenderer.getWidth(text);
switch (this.popupBlockEntity.textAlignment) {
case LEFT -> context.drawTextWithShadow(client.textRenderer, text, this.width / 10, i * 12, this.popupBlockEntity.color);
case CENTER -> context.drawTextWithShadow(client.textRenderer, text, this.width / 2 - lineWidth / 2, i * 12, this.popupBlockEntity.color);
case CENTER, CENTER_LEFT, CENTER_RIGHT -> context.drawTextWithShadow(client.textRenderer, text, this.width / 2 - lineWidth / 2, i * 12, this.popupBlockEntity.color);
case RIGHT -> context.drawTextWithShadow(client.textRenderer, text, this.width - this.width / 10 - lineWidth, i * 12, this.popupBlockEntity.color);
}
}
Expand All @@ -133,7 +133,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {

float push = switch (this.popupBlockEntity.textAlignment) {
case LEFT -> this.width / 10F;
case CENTER -> this.width / 2F - this.textRenderer.getWidth(line) / 2F;
case CENTER, CENTER_LEFT, CENTER_RIGHT -> this.width / 2F - this.textRenderer.getWidth(line) / 2F;
case RIGHT -> this.width - this.width / 10F - this.textRenderer.getWidth(line);
};

Expand Down Expand Up @@ -290,7 +290,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
contentsStart = this.width / 10;
contentsEnd = contentsStart + baseContentsWidth;
}
case CENTER -> {
case CENTER, CENTER_LEFT, CENTER_RIGHT -> {
int midpoint = this.width / 2;
int textMidpoint = baseContentsWidth / 2;
contentsStart = midpoint - textMidpoint;
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/dev/hephaestus/glowcase/client/gui/screen/ingame/TextBlockEditScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ public void init() {
this.changeAlignment = ButtonWidget.builder(Text.stringifiedTranslatable("gui.glowcase.alignment", this.textBlockEntity.textAlignment), action -> {
switch (textBlockEntity.textAlignment) {
case LEFT -> textBlockEntity.textAlignment = TextBlockEntity.TextAlignment.CENTER;
case CENTER -> textBlockEntity.textAlignment = TextBlockEntity.TextAlignment.RIGHT;
case CENTER -> textBlockEntity.textAlignment = TextBlockEntity.TextAlignment.CENTER_LEFT;
case CENTER_LEFT -> textBlockEntity.textAlignment = TextBlockEntity.TextAlignment.CENTER_RIGHT;
case CENTER_RIGHT -> textBlockEntity.textAlignment = TextBlockEntity.TextAlignment.RIGHT;
case RIGHT -> textBlockEntity.textAlignment = TextBlockEntity.TextAlignment.LEFT;
}
this.textBlockEntity.renderDirty = true;
Expand Down Expand Up @@ -158,7 +160,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
int lineWidth = this.textRenderer.getWidth(text);
switch (this.textBlockEntity.textAlignment) {
case LEFT -> context.drawTextWithShadow(client.textRenderer, text, this.width / 10, i * 12, this.textBlockEntity.color);
case CENTER -> context.drawTextWithShadow(client.textRenderer, text, this.width / 2 - lineWidth / 2, i * 12, this.textBlockEntity.color);
case CENTER, CENTER_LEFT, CENTER_RIGHT -> context.drawTextWithShadow(client.textRenderer, text, this.width / 2 - lineWidth / 2, i * 12, this.textBlockEntity.color);
case RIGHT -> context.drawTextWithShadow(client.textRenderer, text, this.width - this.width / 10 - lineWidth, i * 12, this.textBlockEntity.color);
}
}
Expand All @@ -176,7 +178,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {

float push = switch (this.textBlockEntity.textAlignment) {
case LEFT -> this.width / 10F;
case CENTER -> this.width / 2F - this.textRenderer.getWidth(line) / 2F;
case CENTER, CENTER_LEFT, CENTER_RIGHT -> this.width / 2F - this.textRenderer.getWidth(line) / 2F;
case RIGHT -> this.width - this.width / 10F - this.textRenderer.getWidth(line);
};

Expand Down Expand Up @@ -386,7 +388,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
contentsStart = this.width / 10;
contentsEnd = contentsStart + baseContentsWidth;
}
case CENTER -> {
case CENTER, CENTER_LEFT, CENTER_RIGHT -> {
int midpoint = this.width / 2;
int textMidpoint = baseContentsWidth / 2;
contentsStart = midpoint - textMidpoint;
Expand Down
2 changes: 2 additions & 0 deletions ...main/java/dev/hephaestus/glowcase/client/render/block/entity/TextBlockEntityRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ public void renderBaked(TextBlockEntity entity, MatrixStack matrices, VertexCons
double dX = switch (entity.textAlignment) {
case LEFT -> -maxLength / 2D;
case CENTER -> (maxLength - width) / 2D - maxLength / 2D;
case CENTER_LEFT -> -50D - (width / 2D);
case CENTER_RIGHT -> 50D - (width / 2D);
case RIGHT -> maxLength - width - maxLength / 2D;
};

Expand Down