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

Source reformat

Browse Source
This commit is contained in:
Anuken
2019-04-08 09:03:18 -04:00
parent 4a96b9bb00
commit b40beb0d1d
331 changed files with 2822 additions and 3274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/src/io/anuke/mindustry/BundleLauncher.java
View File

@@ -7,15 +7,10 @@ import io.anuke.arc.util.Log;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.io.PropertiesUtils;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.io.*;
import java.nio.file.*;
public class BundleLauncher {
public class BundleLauncher{
public static void main(String[] args) throws Exception{
File file = new File("bundle.properties");
@@ -24,8 +19,9 @@ public class BundleLauncher {
Array<String> removals = new Array<>();
Files.walk(Paths.get("")).forEach(child -> {
try {
if (child.getFileName().toString().equals("bundle.properties") || Files.isDirectory(child) || child.toString().contains("output")) return;
try{
if(child.getFileName().toString().equals("bundle.properties") || Files.isDirectory(child) || child.toString().contains("output"))
return;
Log.info("Parsing bundle: {0}", child);
@@ -49,7 +45,7 @@ public class BundleLauncher {
for(String key : base.orderedKeys()){
if(!other.containsKey(key) || other.get(key).trim().isEmpty()){
other.put(key, base.get(key));
added ++;
added++;
Log.info("&lc- Adding missing key '{0}'...", key);
}
}
@@ -70,7 +66,7 @@ public class BundleLauncher {
Files.write(child, result.toString().getBytes(Strings.utf8));
}catch (IOException e){
}catch(IOException e){
throw new RuntimeException(e);
}
});

36
tools/src/io/anuke/mindustry/Generators.java
View File

@@ -6,10 +6,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.Log;
import io.anuke.mindustry.ImagePacker.GenRegion;
import io.anuke.mindustry.type.ContentType;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.Mech;
import io.anuke.mindustry.type.UnitType;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Block.Icon;
import io.anuke.mindustry.world.blocks.Floor;
@@ -22,7 +19,7 @@ import java.nio.file.Paths;
import static io.anuke.mindustry.Vars.content;
import static io.anuke.mindustry.Vars.tilesize;
public class Generators {
public class Generators{
public static void generate(){
@@ -54,7 +51,7 @@ public class Generators {
Image last = null;
if(block.outlineIcon){
int radius = 3;
GenRegion region = (GenRegion)regions[regions.length-1];
GenRegion region = (GenRegion)regions[regions.length - 1];
Image base = ImagePacker.get(region);
Image out = last = new Image(region.getWidth(), region.getHeight());
for(int x = 0; x < out.width(); x++){
@@ -93,7 +90,7 @@ public class Generators {
int i = 0;
for(TextureRegion region : regions){
i ++;
i++;
if(i != regions.length || last == null){
image.draw(region);
}else{
@@ -163,7 +160,7 @@ public class Generators {
image.drawCenter(mech.region);
}
int off = image.width()/2 - mech.weapon.region.getWidth()/2;
int off = image.width() / 2 - mech.weapon.region.getWidth() / 2;
image.draw(mech.weapon.region, -(int)mech.weaponOffsetX + off, (int)mech.weaponOffsetY + off, false, false);
image.draw(mech.weapon.region, (int)mech.weaponOffsetX + off, (int)mech.weaponOffsetY + off, true, false);
@@ -189,8 +186,8 @@ public class Generators {
for(boolean b : Mathf.booleans){
image.draw(type.weapon.region,
(int)(Mathf.sign(b) * type.weapon.width / Draw.scl + image.width()/2 - type.weapon.region.getWidth()/2),
(int)(type.weaponOffsetY / Draw.scl + image.height()/2f - type.weapon.region.getHeight()/2f),
(int)(Mathf.sign(b) * type.weapon.width / Draw.scl + image.width() / 2 - type.weapon.region.getWidth() / 2),
(int)(type.weaponOffsetY / Draw.scl + image.height() / 2f - type.weapon.region.getHeight() / 2f),
b, false);
}
@@ -205,15 +202,15 @@ public class Generators {
OreBlock ore = (OreBlock)block;
Item item = ore.itemDrop;
for (int i = 0; i < 3; i++) {
for(int i = 0; i < 3; i++){
//get base image to draw on
Image image = new Image(32, 32);
Image shadow = ImagePacker.get(item.name + (i+1));
Image shadow = ImagePacker.get(item.name + (i + 1));
int offset = image.width()/tilesize;
int offset = image.width() / tilesize;
for (int x = 0; x < image.width(); x++) {
for (int y = offset; y < image.height(); y++) {
for(int x = 0; x < image.width(); x++){
for(int y = offset; y < image.height(); y++){
Color color = shadow.getColor(x, y - offset);
//draw semi transparent background
@@ -224,9 +221,9 @@ public class Generators {
}
}
image.draw(ImagePacker.get(item.name + (i+1)));
image.save("../blocks/environment/ore-" + item.name + (i+1));
image.save("../editor/editor-ore-" + item.name + (i+1));
image.draw(ImagePacker.get(item.name + (i + 1)));
image.save("../blocks/environment/ore-" + item.name + (i + 1));
image.save("../editor/editor-ore-" + item.name + (i + 1));
//save icons
image.save(block.name + "-icon-full");
@@ -263,7 +260,8 @@ public class Generators {
result.save("../blocks/environment/" + floor.name + "-edge");
}catch(Exception ignored){}
}catch(Exception ignored){
}
}
});
}

38
tools/src/io/anuke/mindustry/Image.java
View File

@@ -12,7 +12,7 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
class Image {
class Image{
private static ArrayList<Image> toDispose = new ArrayList<>();
private BufferedImage image;
@@ -63,31 +63,31 @@ class Image {
graphics.fillRect(x, y, 1, 1);
}
/**Draws a region at the top left corner.*/
/** Draws a region at the top left corner. */
void draw(TextureRegion region){
draw(region, 0, 0, false, false);
}
/**Draws a region at the center.*/
/** Draws a region at the center. */
void drawCenter(TextureRegion region){
draw(region, (width() - region.getWidth())/2, (height() - region.getHeight())/2, false, false);
draw(region, (width() - region.getWidth()) / 2, (height() - region.getHeight()) / 2, false, false);
}
/**Draws a region at the center.*/
/** Draws a region at the center. */
void drawCenter(TextureRegion region, boolean flipx, boolean flipy){
draw(region, (width() - region.getWidth())/2, (height() - region.getHeight())/2, flipx, flipy);
draw(region, (width() - region.getWidth()) / 2, (height() - region.getHeight()) / 2, flipx, flipy);
}
void drawScaled(Image image){
graphics.drawImage(image.image.getScaledInstance(width(), height(), java.awt.Image.SCALE_AREA_AVERAGING), 0, 0, width(), height(), null);
}
/**Draws an image at the top left corner.*/
/** Draws an image at the top left corner. */
void draw(Image image){
draw(image, 0, 0);
}
/**Draws an image at the coordinates specified.*/
/** Draws an image at the coordinates specified. */
void draw(Image image, int x, int y){
graphics.drawImage(image.image, x, y, null);
}
@@ -102,21 +102,21 @@ class Image {
int ofx = 0, ofy = 0;
graphics.drawImage(ImagePacker.get(region).image,
x, y,
x + region.getWidth(),
y + region.getHeight(),
(flipx ? region.getWidth() : 0) + ofx,
(flipy ? region.getHeight() : 0) + ofy,
(flipx ? 0 : region.getWidth()) + ofx,
(flipy ? 0 : region.getHeight()) + ofy,
null);
x, y,
x + region.getWidth(),
y + region.getHeight(),
(flipx ? region.getWidth() : 0) + ofx,
(flipy ? region.getHeight() : 0) + ofy,
(flipx ? 0 : region.getWidth()) + ofx,
(flipy ? 0 : region.getHeight()) + ofy,
null);
}
/** @param name Name of texture file name to create, without any extensions.*/
/** @param name Name of texture file name to create, without any extensions. */
void save(String name){
try {
try{
ImageIO.write(image, "png", new File(name + ".png"));
}catch (IOException e){
}catch(IOException e){
throw new RuntimeException(e);
}
}

16
tools/src/io/anuke/mindustry/ImagePacker.java
View File

@@ -2,23 +2,17 @@ package io.anuke.mindustry;
import io.anuke.arc.Core;
import io.anuke.arc.collection.ObjectMap;
import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.graphics.g2d.TextureAtlas;
import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.graphics.g2d.TextureAtlas.AtlasRegion;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.*;
import io.anuke.arc.util.Log.LogHandler;
import io.anuke.arc.util.Log.NoopLogHandler;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.core.ContentLoader;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.*;
public class ImagePacker{
static ObjectMap<String, TextureRegion> regionCache = new ObjectMap<>();
@@ -91,12 +85,12 @@ public class ImagePacker{
}
@Override
public boolean has(String s) {
public boolean has(String s){
return regionCache.containsKey(s);
}
};
Draw.scl = 1f/Core.atlas.find("scale_marker").getWidth();
Draw.scl = 1f / Core.atlas.find("scale_marker").getWidth();
Time.mark();
Generators.generate();