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

Ore renaming

Browse Source
This commit is contained in:
Anuken
2022-01-18 10:48:27 -05:00
parent 51aa374225
commit f3811d6710
37 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -668,13 +668,12 @@ public class Generators{
generate("ore-icons", () -> {
content.blocks().<OreBlock>each(b -> b instanceof OreBlock, ore -> {
String prefix = ore instanceof WallOreBlock ? "wall-ore-" : "ore-";
Item item = ore.itemDrop;
ore.load();
int shadowColor = Color.rgba8888(0, 0, 0, 0.3f);
for(int i = 0; i < ore.variants; i++){
//get base image to draw on
Pixmap base = get((ore instanceof WallOreBlock ? "wall-" : "") + item.name + (i + 1));
Pixmap base = get(ore.variantRegions[i]);
Pixmap image = base.copy();
int offset = image.width / tilesize - 1;
@@ -688,9 +687,11 @@ public class Generators{
}
}
replace(ore.variantRegions[i], image);
image.draw(base, true);
save(image, "../blocks/environment/" + prefix + item.name + (i + 1));
save(image, "../editor/editor-" + prefix + item.name + (i + 1));
save(image, "../blocks/environment/" + ore.name + (i + 1));
save(image, "../editor/editor-" + ore.name + (i + 1));
save(image, "block-" + ore.name + "-full");
save(image, "../ui/block-" + ore.name + "-ui");

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

@@ -27,7 +27,7 @@ public class ScriptMainGenerator{
public static void main(String[] args) throws Exception{
String base = "mindustry";
Seq<String> blacklist = Seq.with("plugin", "mod", "net", "io", "tools");
Seq<String> nameBlacklist = Seq.with("ClassAccess");
Seq<String> nameBlacklist = Seq.with();
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, Shader.class,
Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class, Interval.class, DataInput.class, DataOutput.class,