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

🔥🔥🔥🔥🔥🔥maximum breakage

Browse Source
This commit is contained in:
Anuken
2018-12-20 12:38:27 -05:00
parent cabcfc7136
commit 94908bc599
309 changed files with 1883 additions and 1951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,8 +3,8 @@ package io.anuke.mindustry;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.OrderedMap;
import com.badlogic.gdx.utils.PropertiesUtils;
import io.anuke.ucore.function.BiFunction;
import io.anuke.ucore.util.Log;
import io.anuke.arc.function.BiFunction;
import io.anuke.arc.util.Log;
import java.io.File;
import java.io.FileInputStream;

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

@@ -10,8 +10,8 @@ import io.anuke.mindustry.type.Mech;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.Floor;
import io.anuke.mindustry.world.blocks.OreBlock;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Hue;
import io.anuke.arc.graphics.Draw;
import io.anuke.arc.graphics.Hue;
import static io.anuke.mindustry.Vars.*;
public class Generators {

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

@@ -2,7 +2,7 @@ package io.anuke.mindustry;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.ucore.util.Structs;
import io.anuke.arc.util.Structs;
import javax.imageio.ImageIO;
import java.awt.*;

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

@@ -6,12 +6,12 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas.TextureAtlasData.Region;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.ObjectMap;
import io.anuke.mindustry.core.ContentLoader;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.util.Atlas;
import io.anuke.ucore.util.Log;
import io.anuke.ucore.util.Log.LogHandler;
import io.anuke.ucore.util.Log.NoopLogHandler;
import io.anuke.arc.core.Core;
import io.anuke.arc.core.Timers;
import io.anuke.arc.util.Atlas;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.Log.LogHandler;
import io.anuke.arc.util.Log.NoopLogHandler;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
@@ -89,9 +89,9 @@ public class ImageContext {
}
public void generate(String name, Runnable run){
Timers.mark();
Time.mark();
run.run();
Log.info("&ly[Generator]&lc Time to generate &lm{0}&lc: &lg{1}&lcms", name, Timers.elapsed());
Log.info("&ly[Generator]&lc Time to generate &lm{0}&lc: &lg{1}&lcms", name, Time.elapsed());
}
public Image create(int width, int height){

8
tools/src/io/anuke/mindustry/PackerLauncher.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.util.Log;
import io.anuke.arc.core.Timers;
import io.anuke.arc.util.Log;
import java.io.IOException;
@@ -11,9 +11,9 @@ public class PackerLauncher {
Vars.headless = true;
ImageContext context = new ImageContext();
context.load();
Timers.mark();
Time.mark();
Generators.generate(context);
Log.info("&ly[Generator]&lc Total time to generate: &lg{0}&lcms", Timers.elapsed());
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());
Image.dispose();
}