From 9001fb0dccbef72c2c327324bc321e1da16e8615 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 25 Jan 2018 16:33:46 -0500 Subject: [PATCH] Fixed about dialog not showing the right text --- core/src/io/anuke/mindustry/Vars.java | 14 --- core/src/io/anuke/mindustry/io/BundleGen.java | 97 ------------------- .../mindustry/ui/dialogs/AboutDialog.java | 8 +- 3 files changed, 1 insertion(+), 118 deletions(-) delete mode 100644 core/src/io/anuke/mindustry/io/BundleGen.java diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index e96230a322..c37b09c776 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -85,18 +85,4 @@ public class Vars{ public static NetClient netClient; public static Player player; - - public static String[] aboutText = { - "Created by [ROYAL]Anuken.[]", - "Originally an entry in the [orange]GDL[] MM Jam.", - "", - "Credits:", - "- SFX made with [YELLOW]bfxr[]", - "- Music made by [GREEN]RoccoW[] / found on [lime]FreeMusicArchive.org[]", - "", - "Special thanks to:", - "- [coral]MitchellFJN[]: extensive playtesting and feedback", - "- [sky]Luxray5474[]: wiki work, code contributions", - "- All the beta testers on itch.io and Google Play" - }; } diff --git a/core/src/io/anuke/mindustry/io/BundleGen.java b/core/src/io/anuke/mindustry/io/BundleGen.java deleted file mode 100644 index 9049ba4afe..0000000000 --- a/core/src/io/anuke/mindustry/io/BundleGen.java +++ /dev/null @@ -1,97 +0,0 @@ -package io.anuke.mindustry.io; - -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.utils.Array; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.game.Tutorial; -import io.anuke.mindustry.game.Tutorial.Stage; -import io.anuke.mindustry.resource.Item; -import io.anuke.mindustry.resource.Liquid; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.game.GameMode; -import io.anuke.mindustry.world.Map; -import io.anuke.ucore.core.Inputs.DeviceType; -import io.anuke.ucore.core.KeyBinds; -import io.anuke.ucore.core.KeyBinds.Keybind; -import io.anuke.ucore.scene.ui.SettingsDialog.SettingsTable.Setting; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Mathf; - -/**Used for generating a bundle from existing strings in the game.*/ -public class BundleGen { - private static FileHandle file; - - public static void cleanBundles(FileHandle file){ - String[] strings = file.readString().split("\n"); - FileHandle out = Gdx.files.absolute("/home/anuke/out.properties"); - out.writeString("", false); - for(String string : strings){ - if(!string.contains(".description")){ - out.writeString(string + "\n", true); - } - } - } - - public static void buildBundle(FileHandle file){ - BundleGen.file = file; - - file.writeString("", false); - write("about.text=" + join(Vars.aboutText)); - write("discord.text=Join the mindustry discord!\n[orange]"); - - Mathf.each(table -> { - for(Setting setting : table.getSettings()){ - write("setting." + setting.name + ".name=" + setting.title); - } - }, Vars.ui.settings.game, Vars.ui.settings.graphics, Vars.ui.settings.sound); - - for(Map map : Vars.world.maps().list()){ - write("map." + map.name + ".name=" + map.name); - } - for(Tutorial.Stage stage : Stage.values()){ - write("tutorial." + stage.name() + ".text=" + stage.text); - } - for(Keybind bind : KeyBinds.getSection("default").keybinds.get(DeviceType.keyboard)){ - write("keybind." + bind.name + ".name=" + bind.name); - } - for(GameMode mode : GameMode.values()){ - write("mode." + mode.name() + ".name=" + mode.name()); - } - for(Item item : Item.getAllItems()){ - write("item." + item.name + ".name=" + item.name); - } - for(Liquid liquid : Liquid.getAllLiquids()){ - write("liquid." + liquid.name + ".name=" + liquid.name); - } - for(Block block : Block.getAllBlocks()){ - write("block." + block.name + ".name=" + block.formalName); - if(block.fullDescription != null) write("block." + block.name + ".fulldescription=" + block.fullDescription); - if(block.description != null) write("block." + block.name + ".description=" + block.description); - - Array a = new Array<>(); - block.getStats(a); - for(String s : a){ - if(s.contains(":")) { - String color = s.substring(0, s.indexOf("]")+1); - String first = s.substring(color.length(), s.indexOf(":")).replace("/", "").replace(" ", "").toLowerCase(); - String last = s.substring(s.indexOf(":"), s.length()); - s = color + Bundles.getNotNull("text.blocks." + first) + last; - } - } - } - } - - private static void write(String string){ - file.writeString(string.replaceAll("\\n", "\\\\n") + "\n", true); - } - - public static String join(String[] strings){ - String s = ""; - for(String string : strings){ - s += string + "\n"; - } - return s; - } - -} diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java index 0888da52ff..94234a385c 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java @@ -1,17 +1,11 @@ package io.anuke.mindustry.ui.dialogs; -import static io.anuke.mindustry.Vars.aboutText; - public class AboutDialog extends FloatingDialog { public AboutDialog(){ super("$text.about.button"); addCloseButton(); - - for(String text : aboutText){ - content().add(text).left(); - content().row(); - } + content().add("$text.about"); } }