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

Cleaner formatting

Browse Source
This commit is contained in:
Anuken
2020-05-03 21:18:25 -04:00
parent 45d8188ba4
commit becc23ca42
31 changed files with 183 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ public class BundleLauncher{
Fi.get(".").walk(child -> {
if(child.name().equals("bundle.properties") || child.toString().contains("output")) return;
Log.info("Parsing bundle: {0}", child);
Log.info("Parsing bundle: @", child);
OrderedMap<String, String> other = new OrderedMap<>();
PropertiesUtils.load(other, child.reader(2048, "UTF-8"));
@@ -26,10 +26,10 @@ public class BundleLauncher{
for(String key : other.orderedKeys()){
if(!base.containsKey(key)){
removals.add(key);
Log.info("&lr- Removing unused key '{0}'...", key);
Log.info("&lr- Removing unused key '@'...", key);
}
}
Log.info("&lr{0} keys removed.", removals.size);
Log.info("&lr@ keys removed.", removals.size);
for(String s : removals){
other.remove(s);
}
@@ -40,15 +40,15 @@ public class BundleLauncher{
if(!other.containsKey(key) || other.get(key).trim().isEmpty()){
other.put(key, base.get(key));
added++;
Log.info("&lc- Adding missing key '{0}'...", key);
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{0} keys added.", added);
Log.info("Writing bundle to {0}", output);
Log.info("&lc@ keys added.", added);
Log.info("Writing bundle to @", output);
StringBuilder result = new StringBuilder();
//add everything ordered

4
tools/src/mindustry/tools/Generators.java
View File

@@ -165,9 +165,9 @@ public class Generators{
average.a = 1f;
colors.draw(block.id, 0, average);
}catch(IllegalArgumentException e){
Log.info("Skipping &ly'{0}'", block.name);
Log.info("Skipping &ly'@'", block.name);
}catch(NullPointerException e){
Log.err("Block &ly'{0}'&lr has an null region!");
Log.err("Block &ly'@'&lr has an null region!");
}
}

8
tools/src/mindustry/tools/ImagePacker.java
View File

@@ -96,8 +96,8 @@ public class ImagePacker{
Time.mark();
Generators.generate();
Log.info("&ly[Generator]&lc Total time to generate: &lg{0}&lcms", Time.elapsed());
Log.info("&ly[Generator]&lc Total images created: &lg{0}", Image.total());
Log.info("&ly[Generator]&lc Total time to generate: &lg@&lcms", Time.elapsed());
Log.info("&ly[Generator]&lc Total images created: &lg@", Image.total());
Image.dispose();
//format:
@@ -140,7 +140,7 @@ public class ImagePacker{
static void generate(String name, Runnable run){
Time.mark();
run.run();
Log.info("&ly[Generator]&lc Time to generate &lm{0}&lc: &lg{1}&lcms", name, Time.elapsed());
Log.info("&ly[Generator]&lc Time to generate &lm@&lc: &lg@&lcms", name, Time.elapsed());
}
static BufferedImage buf(TextureRegion region){
@@ -181,7 +181,7 @@ public class ImagePacker{
static void validate(TextureRegion region){
if(((GenRegion)region).invalid){
ImagePacker.err("Region does not exist: {0}", ((GenRegion)region).name);
ImagePacker.err("Region does not exist: @", ((GenRegion)region).name);
}
}
}

6
tools/src/mindustry/tools/SectorDataGenerator.java
View File

@@ -95,12 +95,12 @@ public class SectorDataGenerator{
}
if(waterFloors / totalFloors >= 0.6f){
Log.debug("Sector {0} has {1}/{2} water -> naval", sector.id, waterFloors, totalFloors);
Log.debug("Sector @ has @/@ water -> naval", sector.id, waterFloors, totalFloors);
}
//naval sector guaranteed
if(nearTiles > 4){
Log.debug("Sector {0} has {1} water tiles at {2} {3} -> naval", sector.id, nearTiles, cx, cy);
Log.debug("Sector @ has @ water tiles at @ @ -> naval", sector.id, nearTiles, cx, cy);
waterFloors = totalFloors;
}
@@ -125,7 +125,7 @@ public class SectorDataGenerator{
}
if(count[0]++ % 10 == 0){
Log.info("&lyDone with sector &lm{0}/{1}", count[0], planet.sectors.size);
Log.info("&lyDone with sector &lm@/@", count[0], planet.sectors.size);
}
return data;