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

Merge pull request #3229 from skykatik/patch-4

Browse Source 
Cleanup and code formatting
This commit is contained in:
Anuken
2020-11-02 17:59:49 -05:00
committed by GitHub
parent 75d8d4f407 ab604ec1c0
commit 8b4014876e
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
+2 -4
View File
@@ -41,7 +41,7 @@ public class AssetsProcess extends BaseProcessor{
texIcons.each((key, val) -> {
String[] split = val.split("\\|");
String name = Strings.kebabToCamel(split[1]).replace("Medium", "").replace("Icon", "");
if(SourceVersion.isKeyword(name) || name.equals("char")) name = name + "i";
if(SourceVersion.isKeyword(name) || name.equals("char")) name += "i";
ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("(char)" + key).build());
});
@@ -115,9 +115,7 @@ public class AssetsProcess extends BaseProcessor{
names.add(name);
}
if(SourceVersion.isKeyword(name)){
name = name + "s";
}
if(SourceVersion.isKeyword(name)) name += "s";
String filepath = path.substring(path.lastIndexOf("/") + 1) + "/" + fname;