Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced '$' formatting with '@'

Browse Source
This commit is contained in:
Anuken
2020-08-04 10:18:01 -04:00
parent 8dd4839f53
commit f60afc39f1
68 changed files with 458 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
core/src/mindustry/editor/MapEditorDialog.java
View File

@@ -58,7 +58,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
infoDialog = new MapInfoDialog(editor);
generateDialog = new MapGenerateDialog(editor, true);
menu = new BaseDialog("$menu");
menu = new BaseDialog("@menu");
menu.addCloseButton();
float swidth = 180f;
@@ -66,41 +66,41 @@ public class MapEditorDialog extends Dialog implements Disposable{
menu.cont.table(t -> {
t.defaults().size(swidth, 60f).padBottom(5).padRight(5).padLeft(5);
t.button("$editor.savemap", Icon.save, this::save);
t.button("@editor.savemap", Icon.save, this::save);
t.button("$editor.mapinfo", Icon.pencil, () -> {
t.button("@editor.mapinfo", Icon.pencil, () -> {
infoDialog.show();
menu.hide();
});
t.row();
t.button("$editor.generate", Icon.terrain, () -> {
t.button("@editor.generate", Icon.terrain, () -> {
generateDialog.show(generateDialog::applyToEditor);
menu.hide();
});
t.button("$editor.resize", Icon.resize, () -> {
t.button("@editor.resize", Icon.resize, () -> {
resizeDialog.show();
menu.hide();
});
t.row();
t.button("$editor.import", Icon.download, () -> createDialog("$editor.import",
"$editor.importmap", "$editor.importmap.description", Icon.download, (Runnable)loadDialog::show,
"$editor.importfile", "$editor.importfile.description", Icon.file, (Runnable)() ->
t.button("@editor.import", Icon.download, () -> createDialog("@editor.import",
"@editor.importmap", "@editor.importmap.description", Icon.download, (Runnable)loadDialog::show,
"@editor.importfile", "@editor.importfile.description", Icon.file, (Runnable)() ->
platform.showFileChooser(true, mapExtension, file -> ui.loadAnd(() -> {
maps.tryCatchMapError(() -> {
if(MapIO.isImage(file)){
ui.showInfo("$editor.errorimage");
ui.showInfo("@editor.errorimage");
}else{
editor.beginEdit(MapIO.createMap(file, true));
}
});
})),
"$editor.importimage", "$editor.importimage.description", Icon.fileImage, (Runnable)() ->
"@editor.importimage", "@editor.importimage.description", Icon.fileImage, (Runnable)() ->
platform.showFileChooser(true, "png", file ->
ui.loadAnd(() -> {
try{
@@ -108,16 +108,16 @@ public class MapEditorDialog extends Dialog implements Disposable{
editor.beginEdit(pixmap);
pixmap.dispose();
}catch(Exception e){
ui.showException("$editor.errorload", e);
ui.showException("@editor.errorload", e);
Log.err(e);
}
})))
);
t.button("$editor.export", Icon.upload, () -> createDialog("$editor.export",
"$editor.exportfile", "$editor.exportfile.description", Icon.file,
t.button("@editor.export", Icon.upload, () -> createDialog("@editor.export",
"@editor.exportfile", "@editor.exportfile.description", Icon.file,
(Runnable)() -> platform.export(editor.getTags().get("name", "unknown"), mapExtension, file -> MapIO.writeMap(file, editor.createMap(file))),
"$editor.exportimage", "$editor.exportimage.description", Icon.fileImage,
"@editor.exportimage", "@editor.exportimage.description", Icon.fileImage,
(Runnable)() -> platform.export(editor.getTags().get("name", "unknown"), "png", file -> {
Pixmap out = MapIO.writeImage(editor.tiles());
file.writePNG(out);
@@ -128,7 +128,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
menu.cont.row();
if(steam){
menu.cont.button("$editor.publish.workshop", Icon.link, () -> {
menu.cont.button("@editor.publish.workshop", Icon.link, () -> {
Map builtin = maps.all().find(m -> m.name().equals(editor.getTags().get("name", "").trim()));
if(editor.getTags().containsKey("steamid") && builtin != null && !builtin.custom){
@@ -146,26 +146,26 @@ public class MapEditorDialog extends Dialog implements Disposable{
if(map == null) return;
if(map.tags.get("description", "").length() < 4){
ui.showErrorMessage("$editor.nodescription");
ui.showErrorMessage("@editor.nodescription");
return;
}
if(!Structs.contains(Gamemode.all, g -> g.valid(map))){
ui.showErrorMessage("$map.nospawn");
ui.showErrorMessage("@map.nospawn");
return;
}
platform.publish(map);
}).padTop(-3).size(swidth * 2f + 10, 60f).update(b -> b.setText(editor.getTags().containsKey("steamid") ? editor.getTags().get("author").equals(player.name) ? "$workshop.listing" : "$view.workshop" : "$editor.publish.workshop"));
}).padTop(-3).size(swidth * 2f + 10, 60f).update(b -> b.setText(editor.getTags().containsKey("steamid") ? editor.getTags().get("author").equals(player.name) ? "@workshop.listing" : "@view.workshop" : "@editor.publish.workshop"));
menu.cont.row();
}
menu.cont.button("$editor.ingame", Icon.right, this::playtest).padTop(!steam ? -3 : 1).size(swidth * 2f + 10, 60f);
menu.cont.button("@editor.ingame", Icon.right, this::playtest).padTop(!steam ? -3 : 1).size(swidth * 2f + 10, 60f);
menu.cont.row();
menu.cont.button("$quit", Icon.exit, () -> {
menu.cont.button("@quit", Icon.exit, () -> {
tryExit();
menu.hide();
}).size(swidth * 2f + 10, 60f);
@@ -182,7 +182,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
try{
editor.beginEdit(map);
}catch(Exception e){
ui.showException("$editor.errorload", e);
ui.showException("@editor.errorload", e);
Log.err(e);
}
}));
@@ -280,14 +280,14 @@ public class MapEditorDialog extends Dialog implements Disposable{
if(name.isEmpty()){
infoDialog.show();
Core.app.post(() -> ui.showErrorMessage("$editor.save.noname"));
Core.app.post(() -> ui.showErrorMessage("@editor.save.noname"));
}else{
Map map = maps.all().find(m -> m.name().equals(name));
if(map != null && !map.custom){
handleSaveBuiltin(map);
}else{
returned = maps.saveMap(editor.getTags());
ui.showInfoFade("$editor.saved");
ui.showInfoFade("@editor.saved");
}
}
@@ -299,7 +299,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
/** Called when a built-in map save is attempted.*/
protected void handleSaveBuiltin(Map map){
ui.showErrorMessage("$editor.save.overwrite");
ui.showErrorMessage("@editor.save.overwrite");
}
/**
@@ -368,7 +368,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
show();
}catch(Exception e){
Log.err(e);
ui.showException("$editor.errorload", e);
ui.showException("@editor.errorload", e);
}
});
}
@@ -521,7 +521,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
tools.row();
tools.table(Tex.underline, t -> t.add("$editor.teams"))
tools.table(Tex.underline, t -> t.add("@editor.teams"))
.colspan(3).height(40).width(size * 3f + 3f).padBottom(3);
tools.row();
@@ -557,7 +557,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
}
t.top();
t.add("$editor.brush");
t.add("@editor.brush");
t.row();
t.add(slider).width(size * 3f - 20).padTop(4f);
}).padTop(5).growX().top();
@@ -650,7 +650,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
private void tryExit(){
if(!saved){
ui.showConfirm("$confirm", "$editor.unsaved", this::hide);
ui.showConfirm("@confirm", "@editor.unsaved", this::hide);
}else{
hide();
}

16
core/src/mindustry/editor/MapGenerateDialog.java
View File

@@ -58,34 +58,34 @@ public class MapGenerateDialog extends BaseDialog{
/** @param applied whether or not to use the applied in-game mode. */
public MapGenerateDialog(MapEditor editor, boolean applied){
super("$editor.generate");
super("@editor.generate");
this.editor = editor;
this.applied = applied;
shown(this::setup);
addCloseButton();
if(applied){
buttons.button("$editor.apply", () -> {
buttons.button("@editor.apply", () -> {
ui.loadAnd(() -> {
apply();
hide();
});
}).size(160f, 64f);
}else{
buttons.button("$settings.reset", () -> {
buttons.button("@settings.reset", () -> {
filters.set(maps.readFilters(""));
rebuildFilters();
update();
}).size(160f, 64f);
}
buttons.button("$editor.randomize", () -> {
buttons.button("@editor.randomize", () -> {
for(GenerateFilter filter : filters){
filter.randomize();
}
update();
}).size(160f, 64f);
buttons.button("$add", Icon.add, this::showAdd).height(64f).width(140f);
buttons.button("@add", Icon.add, this::showAdd).height(64f).width(140f);
if(!applied){
hidden(this::apply);
@@ -277,12 +277,12 @@ public class MapGenerateDialog extends BaseDialog{
}
if(filters.isEmpty()){
filterTable.add("$filters.empty").wrap().width(200f);
filterTable.add("@filters.empty").wrap().width(200f);
}
}
void showAdd(){
BaseDialog selection = new BaseDialog("$add");
BaseDialog selection = new BaseDialog("@add");
selection.setFillParent(false);
selection.cont.defaults().size(210f, 60f);
int i = 0;
@@ -300,7 +300,7 @@ public class MapGenerateDialog extends BaseDialog{
if(++i % 2 == 0) selection.cont.row();
}
selection.cont.button("$filter.defaultores", () -> {
selection.cont.button("@filter.defaultores", () -> {
maps.addDefaultOres(filters);
rebuildFilters();
update();

24
core/src/mindustry/editor/MapInfoDialog.java
View File

@@ -16,7 +16,7 @@ public class MapInfoDialog extends BaseDialog{
private final CustomRulesDialog ruleInfo = new CustomRulesDialog();
public MapInfoDialog(MapEditor editor){
super("$editor.mapinfo");
super("@editor.mapinfo");
this.editor = editor;
this.waveInfo = new WaveInfoDialog(editor);
this.generate = new MapGenerateDialog(editor, false);
@@ -32,47 +32,47 @@ public class MapInfoDialog extends BaseDialog{
ObjectMap<String, String> tags = editor.getTags();
cont.pane(t -> {
t.add("$editor.mapname").padRight(8).left();
t.add("@editor.mapname").padRight(8).left();
t.defaults().padTop(15);
TextField name = t.field(tags.get("name", ""), text -> {
tags.put("name", text);
}).size(400, 55f).addInputDialog(50).get();
name.setMessageText("$unknown");
name.setMessageText("@unknown");
t.row();
t.add("$editor.description").padRight(8).left();
t.add("@editor.description").padRight(8).left();
TextArea description = t.area(tags.get("description", ""), Styles.areaField, text -> {
tags.put("description", text);
}).size(400f, 140f).addInputDialog(1000).get();
t.row();
t.add("$editor.author").padRight(8).left();
t.add("@editor.author").padRight(8).left();
TextField author = t.field(tags.get("author", Core.settings.getString("mapAuthor", "")), text -> {
tags.put("author", text);
Core.settings.put("mapAuthor", text);
}).size(400, 55f).addInputDialog(50).get();
author.setMessageText("$unknown");
author.setMessageText("@unknown");
t.row();
t.add("$editor.rules").padRight(8).left();
t.button("$edit", () -> {
t.add("@editor.rules").padRight(8).left();
t.button("@edit", () -> {
ruleInfo.show(Vars.state.rules, () -> Vars.state.rules = new Rules());
hide();
}).left().width(200f);
t.row();
t.add("$editor.waves").padRight(8).left();
t.button("$edit", () -> {
t.add("@editor.waves").padRight(8).left();
t.button("@edit", () -> {
waveInfo.show();
hide();
}).left().width(200f);
t.row();
t.add("$editor.generation").padRight(8).left();
t.button("$edit", () -> {
t.add("@editor.generation").padRight(8).left();
t.button("@edit", () -> {
generate.show(Vars.maps.readFilters(editor.getTags().get("genfilters", "")),
filters -> editor.getTags().put("genfilters", JsonIO.write(filters)));
hide();

10
core/src/mindustry/editor/MapLoadDialog.java
View File

@@ -14,11 +14,11 @@ public class MapLoadDialog extends BaseDialog{
private Map selected = null;
public MapLoadDialog(Cons<Map> loader){
super("$editor.loadmap");
super("@editor.loadmap");
shown(this::rebuild);
TextButton button = new TextButton("$load");
TextButton button = new TextButton("@load");
button.setDisabled(() -> selected == null);
button.clicked(() -> {
if(selected != null){
@@ -28,7 +28,7 @@ public class MapLoadDialog extends BaseDialog{
});
buttons.defaults().size(200f, 50f);
buttons.button("$cancel", this::hide);
buttons.button("@cancel", this::hide);
buttons.add(button);
}
@@ -64,9 +64,9 @@ public class MapLoadDialog extends BaseDialog{
}
if(maps.all().size == 0){
table.add("$maps.none").center();
table.add("@maps.none").center();
}else{
cont.add("$editor.loadmap");
cont.add("@editor.loadmap");
}
cont.row();

8
core/src/mindustry/editor/MapResizeDialog.java
View File

@@ -12,7 +12,7 @@ public class MapResizeDialog extends BaseDialog{
int width, height;
public MapResizeDialog(MapEditor editor, Intc2 cons){
super("$editor.resizemap");
super("@editor.resizemap");
shown(() -> {
cont.clear();
width = editor.width();
@@ -21,7 +21,7 @@ public class MapResizeDialog extends BaseDialog{
Table table = new Table();
for(boolean w : Mathf.booleans){
table.add(w ? "$width" : "$height").padRight(8f);
table.add(w ? "@width" : "@height").padRight(8f);
table.defaults().height(60f).padTop(8);
table.field((w ? width : height) + "", TextFieldFilter.digitsOnly, value -> {
@@ -37,8 +37,8 @@ public class MapResizeDialog extends BaseDialog{
});
buttons.defaults().size(200f, 50f);
buttons.button("$cancel", this::hide);
buttons.button("$ok", () -> {
buttons.button("@cancel", this::hide);
buttons.button("@ok", () -> {
cons.get(width, height);
hide();
});

2
core/src/mindustry/editor/WaveGraph.java
View File

@@ -137,7 +137,7 @@ public class WaveGraph extends Table{
ButtonGroup<Button> group = new ButtonGroup<>();
for(Mode m : Mode.all){
t.button("$wavemode." + m.name(), Styles.fullTogglet, () -> {
t.button("@wavemode." + m.name(), Styles.fullTogglet, () -> {
mode = m;
}).group(group).height(35f).update(b -> b.setChecked(m == mode)).width(130f);
}

34
core/src/mindustry/editor/WaveInfoDialog.java
View File

@@ -32,7 +32,7 @@ public class WaveInfoDialog extends BaseDialog{
private WaveGraph graph = new WaveGraph();
public WaveInfoDialog(MapEditor editor){
super("$waves.title");
super("@waves.title");
shown(this::setup);
hidden(() -> {
@@ -48,29 +48,29 @@ public class WaveInfoDialog extends BaseDialog{
onResize(this::setup);
addCloseButton();
buttons.button("$waves.edit", () -> {
BaseDialog dialog = new BaseDialog("$waves.edit");
buttons.button("@waves.edit", () -> {
BaseDialog dialog = new BaseDialog("@waves.edit");
dialog.addCloseButton();
dialog.setFillParent(false);
dialog.cont.defaults().size(210f, 64f);
dialog.cont.button("$waves.copy", () -> {
ui.showInfoFade("$waves.copied");
dialog.cont.button("@waves.copy", () -> {
ui.showInfoFade("@waves.copied");
Core.app.setClipboardText(maps.writeWaves(groups));
dialog.hide();
}).disabled(b -> groups == null);
dialog.cont.row();
dialog.cont.button("$waves.load", () -> {
dialog.cont.button("@waves.load", () -> {
try{
groups = maps.readWaves(Core.app.getClipboardText());
buildGroups();
}catch(Exception e){
e.printStackTrace();
ui.showErrorMessage("$waves.invalid");
ui.showErrorMessage("@waves.invalid");
}
dialog.hide();
}).disabled(b -> Core.app.getClipboardText() == null || Core.app.getClipboardText().isEmpty());
dialog.cont.row();
dialog.cont.button("$settings.reset", () -> ui.showConfirm("$confirm", "$settings.clear.confirm", () -> {
dialog.cont.button("@settings.reset", () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
groups = JsonIO.copy(defaultWaves.get());
buildGroups();
dialog.hide();
@@ -130,12 +130,12 @@ public class WaveInfoDialog extends BaseDialog{
cont.stack(new Table(Tex.clear, main -> {
main.pane(t -> table = t).growX().growY().padRight(8f).get().setScrollingDisabled(true, false);
main.row();
main.button("$add", () -> {
main.button("@add", () -> {
if(groups == null) groups = new Seq<>();
groups.add(new SpawnGroup(lastType));
buildGroups();
}).growX().height(70f);
}), new Label("$waves.none"){{
}), new Label("@waves.none"){{
visible(() -> groups.isEmpty());
this.touchable = Touchable.disabled;
setWrap(true);
@@ -180,7 +180,7 @@ public class WaveInfoDialog extends BaseDialog{
updateWaves();
}
}).width(100f);
spawns.add("$waves.to").padLeft(4).padRight(4);
spawns.add("@waves.to").padLeft(4).padRight(4);
spawns.field(group.end == never ? "" : (group.end + 1) + "", TextFieldFilter.digitsOnly, text -> {
if(Strings.canParsePositiveInt(text)){
group.end = Strings.parseInt(text) - 1;
@@ -193,14 +193,14 @@ public class WaveInfoDialog extends BaseDialog{
});
t.row();
t.table(p -> {
p.add("$waves.every").padRight(4);
p.add("@waves.every").padRight(4);
p.field(group.spacing + "", TextFieldFilter.digitsOnly, text -> {
if(Strings.canParsePositiveInt(text) && Strings.parseInt(text) > 0){
group.spacing = Strings.parseInt(text);
updateWaves();
}
}).width(100f);
p.add("$waves.waves").padLeft(4);
p.add("@waves.waves").padLeft(4);
});
t.row();
@@ -219,7 +219,7 @@ public class WaveInfoDialog extends BaseDialog{
updateWaves();
}
}).width(80f);
a.add("$waves.perspawn").padLeft(4);
a.add("@waves.perspawn").padLeft(4);
});
t.row();
t.table(a -> {
@@ -237,17 +237,17 @@ public class WaveInfoDialog extends BaseDialog{
updateWaves();
}
}).width(80f);
a.add("$waves.shields").padLeft(4);
a.add("@waves.shields").padLeft(4);
});
t.row();
t.check("$waves.guardian", b -> group.effect = (b ? StatusEffects.boss : null)).padTop(4).update(b -> b.setChecked(group.effect == StatusEffects.boss)).padBottom(8f);
t.check("@waves.guardian", b -> group.effect = (b ? StatusEffects.boss : null)).padTop(4).update(b -> b.setChecked(group.effect == StatusEffects.boss)).padBottom(8f);
}).width(340f).pad(8);
table.row();
}
}else{
table.add("$editor.default");
table.add("@editor.default");
}
updateWaves();