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

Seq.

Browse Source
This commit is contained in:
Anuken
2020-06-08 17:19:47 -04:00
parent 87ab895253
commit 8ea28e1ced
147 changed files with 438 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,9 +11,9 @@ public class BundleLauncher{
public static void main(String[] args){
OrderedMap<String, String> base = new OrderedMap<>();
PropertiesUtils.load(base, Fi.get("bundle.properties").reader());
Array<String> removals = new Array<>();
Seq<String> removals = new Seq<>();
String str = Fi.get("bundle.properties").readString();
ObjectSet<String> newlines = Array.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();
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;

2
tools/src/mindustry/tools/Edgifier.java
View File

@@ -17,7 +17,7 @@ public class Edgifier{
private static Pixmap edgify(Pixmap in, int chunk){
Pixmap out = new Pixmap(in.getWidth(), in.getHeight());
IntArray side1 = new IntArray(), side2 = new IntArray();
IntSeq side1 = new IntSeq(), side2 = new IntSeq();
for(int x = 0; x < in.getWidth(); x += chunk){
for(int y = 0; y < in.getHeight(); y += chunk){

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

@@ -229,7 +229,7 @@ public class Generators{
});
ImagePacker.generate("item-icons", () -> {
for(UnlockableContent item : (Array<? extends UnlockableContent>)(Array)Array.withArrays(content.items(), content.liquids())){
for(UnlockableContent item : (Seq<? extends UnlockableContent>)(Seq)Seq.withArrays(content.items(), content.liquids())){
Image base = ImagePacker.get(item.getContentType().name() + "-" + item.name);
for(Cicon icon : Cicon.scaled){
//if(icon.size == base.width) continue;

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

@@ -109,7 +109,7 @@ public class ImagePacker{
ObjectMap<String, String> content2id = new ObjectMap<>();
map.each((key, val) -> content2id.put(val.split("\\|")[0], key));
Array<UnlockableContent> cont = Array.withArrays(Vars.content.blocks(), Vars.content.items(), Vars.content.liquids());
Seq<UnlockableContent> cont = Seq.withArrays(Vars.content.blocks(), Vars.content.items(), Vars.content.liquids());
cont.removeAll(u -> u instanceof BuildBlock || u == Blocks.air);
int minid = 0xF8FF;

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

@@ -1,7 +1,7 @@
package mindustry.tools;
import arc.*;
import arc.struct.Array;
import arc.struct.Seq;
import arc.struct.*;
import arc.files.*;
import arc.graphics.*;
@@ -23,13 +23,13 @@ public class ScriptStubGenerator{
public static void main(String[] args) throws Exception{
String base = "mindustry";
Array<String> blacklist = Array.with("plugin", "mod", "net", "io", "tools");
Array<String> nameBlacklist = Array.with("ClassAccess");
Array<Class<?>> whitelist = Array.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class,
Seq<String> blacklist = Seq.with("plugin", "mod", "net", "io", "tools");
Seq<String> nameBlacklist = Seq.with("ClassAccess");
Seq<Class<?>> whitelist = Seq.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class,
AtlasRegion.class, String.class, Mathf.class, Angles.class, Color.class, Runnable.class, Object.class, Icon.class, Tex.class,
Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class, Interval.class, DataInput.class, DataOutput.class,
DataInputStream.class, DataOutputStream.class, Integer.class, Float.class, Double.class, Long.class, Boolean.class, Short.class, Byte.class, Character.class);
Array<String> nopackage = Array.with("java.lang", "java");
Seq<String> nopackage = Seq.with("java.lang", "java");
List<ClassLoader> classLoadersList = new LinkedList<>();
classLoadersList.add(ClasspathHelper.contextClassLoader());
@@ -46,7 +46,7 @@ public class ScriptStubGenerator{
.include(FilterBuilder.prefix("arc.math"))
));
Array<Class<?>> classes = Array.with(reflections.getSubTypesOf(Object.class));
Seq<Class<?>> classes = Seq.with(reflections.getSubTypesOf(Object.class));
classes.addAll(reflections.getSubTypesOf(Enum.class));
classes.addAll(whitelist);
classes.sort(Structs.comparing(Class::getName));

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

@@ -4,6 +4,7 @@ import arc.*;
import arc.files.*;
import arc.mock.*;
import arc.struct.*;
import arc.struct.ObjectIntMap.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.*;
@@ -45,7 +46,7 @@ public class SectorDataGenerator{
Fi fi = Fi.get("planets").child(planet.name + ".dat");
Array<SectorData> list = planet.sectors.map(sector -> {
Seq<SectorData> list = planet.sectors.map(sector -> {
SectorData data = new SectorData();
ObjectIntMap<Block> floors = new ObjectIntMap<>();
@@ -105,7 +106,7 @@ public class SectorDataGenerator{
}
//sort counts in descending order
Array<ObjectIntMap.Entry<Block>> entries = floors.entries().toArray();
Seq<Entry<Block>> entries = floors.entries().toArray();
entries.sort(e -> -e.value);
//remove all blocks occuring < 30 times - unimportant
entries.removeAll(e -> e.value < 30);