Skip to content

Commit 632d2b3

Browse files
committed
Extract drawing logic into drawStatusEffectOverlay()
1 parent 861b371 commit 632d2b3

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,26 @@ private void renderDurationOverlay(MatrixStack matrices, CallbackInfo c) {
5656
y += 26;
5757
}
5858

59-
String duration = getDurationAsString(statusEffectInstance);
60-
int durationLength = client.textRenderer.getWidth(duration);
61-
drawStringWithShadow(matrices, client.textRenderer, duration, x + 13 - (durationLength / 2), y + 14, 0x99FFFFFF);
62-
63-
int amplifier = statusEffectInstance.getAmplifier();
64-
if (amplifier > 0) {
65-
// Most langages has "translations" for amplifier 1-5, converting to roman numerals
66-
String amplifierString = (amplifier < 6) ? I18n.translate("potion.potency." + amplifier) : "**";
67-
int amplifierLength = client.textRenderer.getWidth(amplifierString);
68-
drawStringWithShadow(matrices, client.textRenderer, amplifierString, x + 22 - amplifierLength, y + 3, 0x99FFFFFF);
69-
}
59+
drawStatusEffectOverlay(matrices, statusEffectInstance, x, y);
7060
}
7161
}
7262
}
7363
}
7464

65+
private void drawStatusEffectOverlay(MatrixStack matrices, StatusEffectInstance statusEffectInstance, int x, int y) {
66+
String duration = getDurationAsString(statusEffectInstance);
67+
int durationLength = client.textRenderer.getWidth(duration);
68+
drawStringWithShadow(matrices, client.textRenderer, duration, x + 13 - (durationLength / 2), y + 14, 0x99FFFFFF);
69+
70+
int amplifier = statusEffectInstance.getAmplifier();
71+
if (amplifier > 0) {
72+
// Most langages has "translations" for amplifier 1-5, converting to roman numerals
73+
String amplifierString = (amplifier < 6) ? I18n.translate("potion.potency." + amplifier) : "**";
74+
int amplifierLength = client.textRenderer.getWidth(amplifierString);
75+
drawStringWithShadow(matrices, client.textRenderer, amplifierString, x + 22 - amplifierLength, y + 3, 0x99FFFFFF);
76+
}
77+
}
78+
7579
@NotNull
7680
private String getDurationAsString(StatusEffectInstance statusEffectInstance) {
7781
int ticks = MathHelper.floor((float) statusEffectInstance.getDuration());

0 commit comments

Comments
 (0)