mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2025-02-07 02:34:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Can't read the signs

Browse source 
- Handle obfuscation in SignVisuals
This commit is contained in:
Jozufozu 2024-09-27 22:34:14 -07:00
parent 9515462d0d
commit bd3aab04bc
2 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/src/lib/java/dev/engine_room/flywheel/lib/visual/text/TextLayer.java
View file

@ -95,7 +95,7 @@ public interface TextLayer {
* @return A new GlyphColor. * @return A new GlyphColor.
*/ */
static GlyphColor always(int color) { static GlyphColor always(int color) {
return style -> adjustColor(color); return style -> color;
} }
/** /**

49
common/src/main/java/dev/engine_room/flywheel/vanilla/SignVisual.java
View file

@ -54,6 +54,10 @@ public class SignVisual extends AbstractBlockEntityVisual<SignBlockEntity> imple
private final TextVisual[] frontText = new TextVisual[4]; private final TextVisual[] frontText = new TextVisual[4];
private final TextVisual[] backText = new TextVisual[4]; private final TextVisual[] backText = new TextVisual[4];
// Need to update these every frame, so just remember which ones are obfuscated
// Most of the time this will be empty.
private final List<TextVisual> obfuscated = new ArrayList<>();
private SignText lastFrontText; private SignText lastFrontText;
private SignText lastBackText; private SignText lastBackText;
@ -93,22 +97,34 @@ public class SignVisual extends AbstractBlockEntityVisual<SignBlockEntity> imple
lastFrontText = blockEntity.getFrontText(); lastFrontText = blockEntity.getFrontText();
lastBackText = blockEntity.getBackText(); lastBackText = blockEntity.getBackText();
this.setupText(lastFrontText, frontText, true); this.setupText(lastFrontText, true);
this.setupText(lastBackText, backText, false); this.setupText(lastBackText, false);
} }
@Override @Override
public void beginFrame(Context ctx) { public void beginFrame(Context ctx) {
// Need to update every frame if the text is obfuscated boolean setup = false;
if (lastFrontText != blockEntity.getFrontText()) { if (lastFrontText != blockEntity.getFrontText()) {
lastFrontText = blockEntity.getFrontText(); lastFrontText = blockEntity.getFrontText();
this.setupText(lastFrontText, frontText, true); setup = true;
} }
if (lastBackText != blockEntity.getBackText()) { if (lastBackText != blockEntity.getBackText()) {
lastBackText = blockEntity.getBackText(); lastBackText = blockEntity.getBackText();
this.setupText(lastBackText, backText, false); setup = true;
}
if (setup) {
// Setup both to make it easier to track obfuscation
obfuscated.clear();
this.setupText(lastBackText, false);
this.setupText(lastFrontText, true);
} else {
// The is visible check is relatively expensive compared to the boolean checks above,
// so only do it when it'll actually save some work in obfuscating.
if (isVisible(ctx.frustum())) {
obfuscated.forEach(TextVisual::setup);
}
} }
} }
@ -158,7 +174,7 @@ public class SignVisual extends AbstractBlockEntityVisual<SignBlockEntity> imple
return TEXT_OFFSET; return TEXT_OFFSET;
} }
void setupText(SignText text, TextVisual[] dst, boolean isFrontText) { protected void setupText(SignText text, boolean isFrontText) {
FormattedCharSequence[] formattedCharSequences = text.getRenderMessages(Minecraft.getInstance() FormattedCharSequence[] formattedCharSequences = text.getRenderMessages(Minecraft.getInstance()
.isTextFilteringEnabled(), component -> { .isTextFilteringEnabled(), component -> {
List<FormattedCharSequence> list = Minecraft.getInstance().font.split(component, blockEntity.getMaxTextLineWidth()); List<FormattedCharSequence> list = Minecraft.getInstance().font.split(component, blockEntity.getMaxTextLineWidth());
@ -167,10 +183,10 @@ public class SignVisual extends AbstractBlockEntityVisual<SignBlockEntity> imple
List<TextLayer> layers = new ArrayList<>(); List<TextLayer> layers = new ArrayList<>();
int darkColor = adjustColor(getDarkColor(text)); int darkColor = TextLayer.GlyphColor.adjustColor(getDarkColor(text));
int textColor; int textColor;
if (text.hasGlowingText()) { if (text.hasGlowingText()) {
textColor = adjustColor(text.getColor() textColor = TextLayer.GlyphColor.adjustColor(text.getColor()
.getTextColor()); .getTextColor());
layers.add(new SimpleTextLayer.Builder().style(TextLayer.GlyphMeshStyle.OUTLINE) layers.add(new SimpleTextLayer.Builder().style(TextLayer.GlyphMeshStyle.OUTLINE)
@ -187,6 +203,8 @@ public class SignVisual extends AbstractBlockEntityVisual<SignBlockEntity> imple
.bias(1) .bias(1)
.build()); .build());
var dst = isFrontText ? frontText : backText;
int lineHeight = blockEntity.getTextLineHeight(); int lineHeight = blockEntity.getTextLineHeight();
int lineDelta = 4 * lineHeight / 2; int lineDelta = 4 * lineHeight / 2;
for (int m = 0; m < 4; ++m) { for (int m = 0; m < 4; ++m) {
@ -213,17 +231,18 @@ public class SignVisual extends AbstractBlockEntityVisual<SignBlockEntity> imple
textPose.scale(scale, -scale, scale); textPose.scale(scale, -scale, scale);
textVisual.setup(); textVisual.setup();
if (hasObfuscation(formattedCharSequence)) {
this.obfuscated.add(textVisual);
}
} }
} }
private static int adjustColor(int color) { public static boolean hasObfuscation(FormattedCharSequence text) {
if ((color & 0xFC000000) == 0) { return text.accept((i, s, j) -> s.isObfuscated());
return color | 0xFF000000;
}
return color;
} }
static int getDarkColor(SignText signText) { public static int getDarkColor(SignText signText) {
int i = signText.getColor() int i = signText.getColor()
.getTextColor(); .getTextColor();
if (i == DyeColor.BLACK.getTextColor() && signText.hasGlowingText()) { if (i == DyeColor.BLACK.getTextColor() && signText.hasGlowingText()) {