diff --git a/core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay.png~ b/core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay.png~ deleted file mode 100644 index 5a9c7dbf45..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay.png~ and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-1-flat-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-1-flat-autotile.png deleted file mode 100644 index a5bbed72ea..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/crux-floor-1-flat-autotile.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-11.aseprite b/core/assets-raw/sprites/blocks/environment/crux-floor-11.aseprite deleted file mode 100644 index 545f8a629a..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/crux-floor-11.aseprite and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.aseprite b/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.aseprite deleted file mode 100644 index 845d7c2640..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.aseprite and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-5-autotile.aseprite b/core/assets-raw/sprites/blocks/environment/crux-floor-5-autotile.aseprite deleted file mode 100644 index 1a8af32f19..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/crux-floor-5-autotile.aseprite and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile.aseprite b/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile.aseprite deleted file mode 100644 index 5e8b65ea45..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile.aseprite and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.aseprite b/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.aseprite deleted file mode 100644 index de23d4ea85..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.aseprite and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-generic.png b/core/assets-raw/sprites/blocks/environment/crux-floor-generic.png deleted file mode 100644 index 08b4c222d0..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/crux-floor-generic.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-generic2.png b/core/assets-raw/sprites/blocks/environment/crux-floor-generic2.png deleted file mode 100644 index 2c113a2cd6..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/crux-floor-generic2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/pipes.png b/core/assets-raw/sprites/blocks/environment/pipes.png deleted file mode 100644 index 25962a405b..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/pipes.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/plating.png b/core/assets-raw/sprites/blocks/environment/plating.png deleted file mode 100644 index 534913714b..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/plating.png and /dev/null differ diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index 76f8cec5f6..18f68ec2c9 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -80,7 +80,7 @@ public class Generators{ //theoretically this might not finish in time, but I doubt that will ever happen mainExecutor.submit(() -> { try{ - ImageTileGenerator.generate(basePath, block.name + (variants <= 1 ? "" : "-" + (variant+1)), new Fi("../../../assets-raw/sprites_out/blocks/environment/" + (block.name + (variants <= 1 ? "" : "-" + (variant+1))))); + ImageTileGenerator.generate(basePath, block.name + (variants <= 1 ? "" : "-" + (variant+1)), new Fi("../../../assets-raw/sprites_out/blocks/environment")); }catch(Throwable e){ Log.err("Failed to autotile: " + block.name, e); }finally{ @@ -514,7 +514,7 @@ public class Generators{ Pixmap container = new Pixmap(base.width + 10, base.height + 10); container.draw(base, 5, 5, true); - replace("sector-" + item.name, container.outline(Pal.darkerGray, 5)); + replace("../ui/sector-" + item.name, "sector-" + item.name, container.outline(Pal.darkerGray, 5)); } }); diff --git a/tools/src/mindustry/tools/ImagePacker.java b/tools/src/mindustry/tools/ImagePacker.java index 7018acf998..5ab4153826 100644 --- a/tools/src/mindustry/tools/ImagePacker.java +++ b/tools/src/mindustry/tools/ImagePacker.java @@ -29,6 +29,8 @@ public class ImagePacker{ //makes PNG loading slightly faster ArcNativesLoader.load(); + fixSubdirectory("blocks/environment/character-overlay"); + Core.settings = new MockSettings(); Log.logger = new NoopLogHandler(); Vars.content = new ContentLoader(); @@ -200,6 +202,15 @@ public class ImagePacker{ } } + static void fixSubdirectory(String dir){ + Fi folder = Fi.get("../../../assets-raw/sprites_out/" + dir); + Fi parent = folder.parent(); + folder.walk(fi -> { + fi.moveTo(parent.child(fi.name())); + }); + folder.delete(); + } + static String texname(UnlockableContent c){ return c.getContentType() + "-" + c.name + "-ui"; } @@ -251,7 +262,11 @@ public class ImagePacker{ } static void replace(String name, Pixmap image){ - Fi.get(name + ".png").writePng(image); + replace(name, name, image); + } + + static void replace(String path, String name, Pixmap image){ + Fi.get(path + ".png").writePng(image); ((GenRegion)Core.atlas.find(name)).path.delete(); }