diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 08958e7714..baeec1d3a3 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -557,7 +557,7 @@ editor.default = [lightgray]<デフォルト> details = 詳細... edit = 編集... variables = 変数 -logic.error.toolong = Processor code too long (Limit: {0} compressed bytes, actual length: {1} bytes) +logic.error.toolong = プロセッサのコードが長すぎます(制限: 圧縮後 {0} バイト、実際の長さ: {1} バイト) logic.clear.confirm = このプロセッサからすべてのコードを消去しますか? logic.restart = 再起動 logic.globals = 組み込み変数 diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java index 508ec2a6c9..1f3ccd390e 100644 --- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -593,7 +593,6 @@ public class SchematicsDialog extends BaseDialog{ void buildTags(Schematic schem, Table t, boolean name){ t.clearChildren(); - t.left(); //sort by order in the main target array. the complexity of this is probably awful schem.labels.sort(s -> tags.indexOf(s)); @@ -755,14 +754,16 @@ public class SchematicsDialog extends BaseDialog{ public void show(Schematic schem){ cont.clear(); - title.setText("[[" + Core.bundle.get("schematic") + "] " +schem.name()); + title.setText("[[" + Core.bundle.get("schematic") + "] " + schem.name()); - cont.add(Core.bundle.format("schematic.info", schem.width, schem.height, schem.tiles.size)).color(Color.lightGray).row(); - cont.table(tags -> buildTags(schem, tags)).fillX().left().row(); - cont.add(new SchematicImage(schem)).maxSize(800f).row(); + Table inner = new Table(); + + inner.add(Core.bundle.format("schematic.info", schem.width, schem.height, schem.tiles.size)).color(Color.lightGray).row(); + inner.table(tags -> buildTags(schem, tags)).fillX().pad(6).row(); + inner.add(new SchematicImage(schem)).maxSize(800f).row(); ItemSeq arr = schem.requirements(); - cont.table(r -> { + inner.table(r -> { int i = 0; for(ItemStack s : arr){ r.image(s.item.uiIcon).left().size(iconMed); @@ -776,12 +777,10 @@ public class SchematicsDialog extends BaseDialog{ r.row(); } } - }); - cont.row(); + }).pad(6).row(); float cons = schem.powerConsumption() * 60, prod = schem.powerProduction() * 60; if(!Mathf.zero(cons) || !Mathf.zero(prod)){ - cont.table(t -> { - + inner.table(t -> { if(!Mathf.zero(prod)){ t.image(Icon.powerSmall).color(Pal.powerLight).padRight(3); t.add("+" + Strings.autoFixed(prod, 2)).color(Pal.powerLight).left(); @@ -795,9 +794,17 @@ public class SchematicsDialog extends BaseDialog{ t.image(Icon.powerSmall).color(Pal.remove).padRight(3); t.add("-" + Strings.autoFixed(cons, 2)).color(Pal.remove).left(); } - }); + }).row(); } + if(!schem.description().isEmpty()){ + inner.add("[lightgray]" + schem.description()).wrap().padTop(20).growX().maxWidth(500).padLeft(8).padRight(8).row(); + } + + cont.pane(p -> { + p.add(inner).growX(); + }).grow().scrollX(false).scrollY(true); + buttons.clearChildren(); buttons.defaults().size(Core.graphics.isPortrait() ? 150f : 210f, 64f); buttons.button("@back", Icon.left, this::hide);