Skip to content

Commit 3a60de9

Browse files
fix stuff
1 parent 7e94704 commit 3a60de9

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/main/java/com/gregtechceu/gtceu/api/placeholder/PlaceholderHandler.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public static MultiLineComponent processPlaceholders(String s, @Nullable Placeho
104104
Stack<List<MultiLineComponent>> stack = new Stack<>();
105105
stack.push(GTUtil.list(MultiLineComponent.empty()));
106106
for (char c : s.toCharArray()) {
107+
if (!exceptions.isEmpty()) break;
107108
if (c == '\'' && prev == '[') {
108109
singleEscapes++;
109110
symbol++;
@@ -177,8 +178,10 @@ public static MultiLineComponent processPlaceholders(String s, @Nullable Placeho
177178
if (i != result.size() - 1) GTUtil.getLast(stack.peek()).appendNewline();
178179
}
179180
}
181+
} catch (PlaceholderException e) {
182+
exceptions.add(e);
183+
e.setLineInfo(line, symbol);
180184
}
181-
default -> GTUtil.getLast(stack.peek()).append(c);
182185
}
183186
default -> {
184187
lineBeginningWhitespace = false;
@@ -276,14 +279,14 @@ public static Flow createPlaceholderEditor(PanelSyncManager syncManager,
276279
.child(Flow.row()
277280
.height(20)
278281
.childIf(scaleDouble != null,
279-
new TextWidget<>(IKey.lang("gtceu.gui.central_monitor.text_scale")))
282+
() -> new TextWidget<>(IKey.lang("gtceu.gui.central_monitor.text_scale")))
280283
.childIf(scaleDouble != null, () -> new TextFieldWidget()
281284
.setNumbersDouble(x -> Math.max(x, 0))
282285
.setDefaultNumber(1.0)
283286
.value(scaleDouble)
284287
.marginLeft(4))
285288
.childIf(updateInterval != null,
286-
new TextWidget<>(IKey.lang("gtceu.gui.computer_monitor_cover.update_interval")))
289+
() -> new TextWidget<>(IKey.lang("gtceu.gui.computer_monitor_cover.update_interval")))
287290
.childIf(updateInterval != null, () -> new TextFieldWidget()
288291
.setNumbers(1, 1000)
289292
.setDefaultNumber(1)

0 commit comments

Comments
 (0)