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

Merge branch 'master' into crater

Browse Source 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/world/modules/ItemModule.java
This commit is contained in:
Patrick 'Quezler' Mounier
2020-03-05 10:00:02 +01:00
parent 4bb9a93ff9 0534a4da45
commit e5e4884448
656 changed files with 3579 additions and 1832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/build.gradle
View File

@@ -34,7 +34,7 @@ def transformColors = { List<List<String>> list ->
}
transformColors([["6e7080", "989aa4", "b0bac0"], ["bc5452", "ea8878", "feb380"], ["dea158", "f8c266", "ffe18f"], ["feb380", "ea8878", "bc5452"]])
transformColors([["6e7080", "989aa4", "b0bac0"], ["bc5452", "ea8878", "feb380"], ["de9458", "f8c266", "ffe18f"], ["feb380", "ea8878", "bc5452"]])
def antialias = { File file ->
if(!doAntialias || file.lastModified() <= 1000) return

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

@@ -31,7 +31,7 @@ public class FontGenerator{
String session = folder.child("session").readString();
net.httpGet("http://fontello.com/" + session + "/get", result -> {
try{
Streams.copyStream(result.getResultAsStream(), folder.child("font.zip").write());
Streams.copy(result.getResultAsStream(), folder.child("font.zip").write());
}catch(IOException e){
throw new RuntimeException(e);
}

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

@@ -30,13 +30,6 @@ public class ScriptStubGenerator{
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");
String fileTemplate = "package mindustry.mod;\n" +
"\nimport arc.struct.*;\n" +
"//obviously autogenerated, do not touch\n" +
"public class ClassAccess{\n" +
"\tpublic static final ObjectSet<String> allowedClassNames = ObjectSet.with($ALLOWED_CLASS_NAMES$);\n" +
"}";
List<ClassLoader> classLoadersList = new LinkedList<>();
classLoadersList.add(ClasspathHelper.contextClassLoader());
classLoadersList.add(ClasspathHelper.staticClassLoader());
@@ -73,8 +66,5 @@ public class ScriptStubGenerator{
//Log.info(result);
new Fi("core/assets/scripts/global.js").writeString(result.toString());
new Fi("core/src/mindustry/mod/ClassAccess.java").writeString(fileTemplate
.replace("$ALLOWED_CLASSES$", classes.toString(", ", type -> type.getName() + ".class"))
.replace("$ALLOWED_CLASS_NAMES$", classes.toString(", ", type -> "\"" + type.getName() + "\"")));
}
}