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 5cb4a814..8a5cb059 100644 Binary files a/res/sprites/blocks/distribution/tin-belt/conveyor-tin-belt.png and b/res/sprites/blocks/distribution/tin-belt/conveyor-tin-belt.png differ diff --git a/res/sprites/blocks/distribution/tin-belt/conveyor-tin-belt.png.bak b/res/sprites/blocks/distribution/tin-belt/conveyor-tin-belt.png.bak new file mode 100644 index 00000000..1ac0d6f1 Binary files /dev/null and b/res/sprites/blocks/distribution/tin-belt/conveyor-tin-belt.png.bak differ 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;