Skip to content

Commit fdf78ec

Browse files
committed
fix opacity has no effect on text, and setEnabled does not trigger auto update
1 parent eee9665 commit fdf78ec

4 files changed

Lines changed: 32 additions & 17 deletions

File tree

src/main/java/de/srendi/advancedperipherals/client/smartglasses/objects/twodim/TextRenderer.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,20 @@ public void renderBatch(List<TextObject> objects, GuiGraphics gui, PoseStack ign
2222
float x = text.x;
2323

2424
if (text.center) {
25-
x -= (minecraft.font.width(text.content) * text.fontSize) / 2f;
25+
x -= minecraft.font.width(text.content) / 2;
2626
}
2727

2828
gui.pose().pushPose();
2929

30-
gui.pose().translate(x / text.fontSize, text.y / text.fontSize, text.z);
30+
gui.pose().translate(x, text.y, text.z);
31+
gui.pose().scale(text.fontSize, text.fontSize, 1);
3132
gui.pose().mulPose(Axis.XP.rotationDegrees(rotX));
3233
gui.pose().mulPose(Axis.YP.rotationDegrees(rotY));
3334
gui.pose().mulPose(Axis.ZP.rotationDegrees(rotZ));
3435

35-
gui.pose().scale(text.fontSize, text.fontSize, 1);
36+
int color = text.color & 0xffffff | ((int) (Math.min(Math.max(text.opacity, 0), 1) * 0xff) << 24);
3637

37-
gui.drawString(minecraft.font, text.content, 0, 0, text.color, text.shadow);
38+
gui.drawString(minecraft.font, text.content, 0, 0, color, text.shadow);
3839

3940
gui.pose().popPose();
4041
}

src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/OverlayGlassesFunctions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ public final int update() {
143143
}
144144

145145
@LuaFunction
146-
public final boolean autoUpdatde() {
146+
public final boolean autoUpdate() {
147147
return overlayModule.autoUpdate;
148148
}
149149

150150
@LuaFunction
151-
public final void autoUpdate(boolean autoUpdate) {
151+
public final void setAutoUpdate(boolean autoUpdate) {
152152
overlayModule.autoUpdate = autoUpdate;
153153
}
154154
}

src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/OverlayObject.java

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,35 +40,43 @@ public OverlayObject(UUID player) {
4040
this.player = player;
4141
}
4242

43-
public void setId(int id) {
44-
this.id = id;
43+
public boolean isEnabled() {
44+
return this.enabled;
45+
}
46+
47+
public void setEnabled(boolean enabled) {
48+
this.enabled = enabled;
4549
}
4650

4751
public int getId() {
48-
return id;
52+
return this.id;
53+
}
54+
55+
public void setId(int id) {
56+
this.id = id;
4957
}
5058

5159
public OverlayModule getModule() {
52-
return module;
60+
return this.module;
5361
}
5462

5563
public UUID getPlayer() {
56-
return player;
64+
return this.player;
5765
}
5866

5967
@LuaFunction("getId")
6068
public final int getIdLua() {
6169
return this.getId();
6270
}
6371

64-
@LuaFunction
65-
public final boolean isEnabled() {
66-
return enabled;
72+
@LuaFunction("isEnabled")
73+
public final boolean isEnabledLua() {
74+
return this.isEnabled();
6775
}
6876

69-
@LuaFunction
70-
public final void setEnabled(boolean enabled) {
71-
this.enabled = enabled;
77+
@LuaFunction("setEnabled")
78+
public final void setEnabledLua(boolean enabled) {
79+
this.setEnabled(enabled);
7280
}
7381

7482
/**

src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/RenderableObject.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ public void sendUpdate() {
6262
this.getModule().update(this);
6363
}
6464

65+
@Override
66+
public void setEnabled(boolean enabled) {
67+
super.setEnabled(enabled);
68+
this.sendUpdate();
69+
}
70+
6571
@LuaFunction
6672
public final float getOpacity() {
6773
return opacity;

0 commit comments

Comments
 (0)