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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
This commit is contained in:
Anuken
2021-11-22 12:11:31 -05:00
parent 65f36faf71 cec39f8a70
commit a48911b983
37 changed files with 1707 additions and 1913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
tools/src/mindustry/tools/BundleLauncher.java
View File

@@ -1,64 +0,0 @@
package mindustry.tools;
import arc.files.*;
import arc.func.*;
import arc.struct.*;
import arc.util.*;
import arc.util.io.*;
public class BundleLauncher{
public static void main(String[] args){
OrderedMap<String, String> base = new OrderedMap<>();
PropertiesUtils.load(base, Fi.get("bundle.properties").reader());
Seq<String> removals = new Seq<>();
String str = Fi.get("bundle.properties").readString();
ObjectSet<String> newlines = Seq.with(str.split("\n")).select(l -> l.contains(" = ") && str.indexOf(l) + l.length() < str.length() - 2 && str.charAt(str.indexOf(l) + l.length() + 1) == '\n').map(l -> l.split(" = ")[0]).asSet();
Fi.get(".").walk(child -> {
if(child.name().equals("bundle.properties") || child.toString().contains("output")) return;
Log.info("Parsing bundle: @", child);
OrderedMap<String, String> other = new OrderedMap<>();
PropertiesUtils.load(other, child.reader(2048, "UTF-8"));
removals.clear();
for(String key : other.orderedKeys()){
if(!base.containsKey(key)){
removals.add(key);
Log.info("&lr- Removing unused key '@'...", key);
}
}
Log.info("&lr@ keys removed.", removals.size);
for(String s : removals){
other.remove(s);
}
int added = 0;
for(String key : base.orderedKeys()){
if(!other.containsKey(key) || other.get(key).trim().isEmpty()){
other.put(key, base.get(key));
added++;
Log.info("&lc- Adding missing key '@'...", key);
}
}
Func2<String, String, String> processor = (key, value) -> (key + " = " + value).replace("\\", "\\\\").replace("\n", "\\n") + "\n" + (newlines.contains(key) ? "\n" : "");
Fi output = child.sibling("output/" + child.name());
Log.info("&lc@ keys added.", added);
Log.info("Writing bundle to @", output);
StringBuilder result = new StringBuilder();
//add everything ordered
for(String key : base.orderedKeys()){
result.append(processor.get(key, other.get(key)));
other.remove(key);
}
child.writeString(result.toString());
});
}
}