From 652e3f119a33f533603acb744fe8aee4b45c21f4 Mon Sep 17 00:00:00 2001 From: nekit508 Date: Sat, 3 Aug 2024 10:32:53 +0400 Subject: [PATCH] do not delete new .bak file --- build.gradle | 22 +----------------- .../tin-belt/conveyor-tin-belt.png | Bin 3857 -> 3366 bytes .../tin-belt/conveyor-tin-belt.png.bak | Bin 0 -> 3317 bytes src/fos/graphics/ConveyorSpritesPacker.java | 3 ++- 4 files changed, 3 insertions(+), 22 deletions(-) create mode 100644 res/sprites/blocks/distribution/tin-belt/conveyor-tin-belt.png.bak diff --git a/build.gradle b/build.gradle index ba7a6c99..b45d9129 100644 --- a/build.gradle +++ b/build.gradle @@ -191,24 +191,4 @@ configure(rootProject){ command.execute(null, layout.projectDirectory.asFile).waitForProcessOutput(System.out, System.err) } } -} - -for(def i = 0; i < 2; i++){ - final def isDex = i == 1 - final def name = isDex ? 'installDex' : 'install' - final def input = isDex ? tasks.dex : tasks.jar - - tasks.register(name){ - inputs.files input - doLast{ - def folder = Fi.get(OS.getAppDataDirectoryString('Mindustry')).child('mods') - folder.mkdirs() - - folder.child(tasks.jar.archiveFileName.get()).delete() - folder.child(tasks.dex.archiveFileName.get()).delete() - - new Fi(input.archiveFile.get().asFile).copyTo(folder) - logger.log(LogLevel.LIFECYCLE, "Copied :${isDex ? 'dex' : 'jar'} output to $folder.") - } - } -} +} \ No newline at end of file diff --git a/res/sprites/blocks/distribution/tin-belt/conveyor-tin-belt.png b/res/sprites/blocks/distribution/tin-belt/conveyor-tin-belt.png index 5cb4a814b2e3c8706b4c27636c87df619ad281a2..8a5cb059425674bdda8fee6bec7ec4ca7ea72ce4 100644 GIT binary patch literal 3366 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 literal 3857 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 literal 0 HcmV?d00001 diff --git a/src/fos/graphics/ConveyorSpritesPacker.java b/src/fos/graphics/ConveyorSpritesPacker.java index cc767bf3..8492ed72 100644 --- a/src/fos/graphics/ConveyorSpritesPacker.java +++ b/src/fos/graphics/ConveyorSpritesPacker.java @@ -11,6 +11,7 @@ public class ConveyorSpritesPacker { // TODO rename public static Field packer; + public static int spacing = 4; static { try { packer = Vars.mods.getClass().getDeclaredField("packer"); @@ -45,7 +46,7 @@ public static void generateRegions(TextureAtlas.AtlasRegion region, String prefi for (int y = 0; y < 5; y++) { for (int x = 0; x < 5; x++) { TextureAtlas.AtlasRegion newRegion = new TextureAtlas.AtlasRegion( - region.texture, region.getX() + x * 32, region.getY() + y * 32, 32, 32); + region.texture, region.getX() + x * (32 + spacing), region.getY() + y * (32 + spacing), 32, 32); if(region.splits != null){ newRegion.splits = region.splits;