diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor.png b/core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor.png new file mode 100644 index 0000000000..76b29569ea Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-0.png new file mode 100644 index 0000000000..2e55ce429a Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-0.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-1.png new file mode 100644 index 0000000000..34a281b719 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-2.png new file mode 100644 index 0000000000..0b7db4da5c Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-3.png new file mode 100644 index 0000000000..a85cfdad60 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-0.png new file mode 100644 index 0000000000..18736adf66 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-0.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-1.png new file mode 100644 index 0000000000..807b2bf17d Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-2.png new file mode 100644 index 0000000000..faf67a8736 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-3.png new file mode 100644 index 0000000000..edbb81841f Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-0.png new file mode 100644 index 0000000000..ffd0e24f58 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-0.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-1.png new file mode 100644 index 0000000000..f249623779 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-2.png new file mode 100644 index 0000000000..3c04427e1a Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-3.png new file mode 100644 index 0000000000..439afb9c4b Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-0.png new file mode 100644 index 0000000000..2485ac23b6 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-0.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-1.png new file mode 100644 index 0000000000..c7997843d0 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-2.png new file mode 100644 index 0000000000..22e6868cce Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-3.png new file mode 100644 index 0000000000..7a94546637 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-0.png new file mode 100644 index 0000000000..3563503f6f Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-0.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-1.png new file mode 100644 index 0000000000..83c49920b4 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-2.png new file mode 100644 index 0000000000..c89f011734 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-3.png new file mode 100644 index 0000000000..acfe7e8136 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-0.png new file mode 100644 index 0000000000..29af97eb5c Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-0.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-1.png new file mode 100644 index 0000000000..ecd054afa6 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-2.png new file mode 100644 index 0000000000..7dc49bd440 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-3.png new file mode 100644 index 0000000000..97e31e5722 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-0.png new file mode 100644 index 0000000000..7e7bb86c62 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-0.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-1.png new file mode 100644 index 0000000000..ffbafc5cdf Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-2.png new file mode 100644 index 0000000000..f9dd561d6d Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-3.png new file mode 100644 index 0000000000..5377953723 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-0.png new file mode 100644 index 0000000000..2f53cd53fd Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-0.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-1.png new file mode 100644 index 0000000000..29727566b0 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-2.png new file mode 100644 index 0000000000..464a7d4cf8 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-3.png new file mode 100644 index 0000000000..53c6124f64 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-0.png new file mode 100644 index 0000000000..aee4b266b2 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-0.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-1.png new file mode 100644 index 0000000000..a547a7790f Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-2.png new file mode 100644 index 0000000000..0dafebb699 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-3.png new file mode 100644 index 0000000000..ae7bad0c38 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-0.png new file mode 100644 index 0000000000..e001d5f945 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-0.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-1.png new file mode 100644 index 0000000000..992e544fc7 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-2.png new file mode 100644 index 0000000000..9c26ceef47 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-3.png new file mode 100644 index 0000000000..09db7b8269 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/junction.png b/core/assets-raw/sprites_replacement/blocks/distribution/junction.png new file mode 100644 index 0000000000..e84244e630 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/distribution/junction.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-0.png b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-0.png new file mode 100644 index 0000000000..9dc9384971 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-0.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-1.png b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-1.png new file mode 100644 index 0000000000..e219a5751d Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-5.png b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-5.png new file mode 100644 index 0000000000..72461ba0b6 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-5.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-0.png b/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-0.png new file mode 100644 index 0000000000..c6a453fed9 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-0.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-1.png b/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-1.png new file mode 100644 index 0000000000..62f03471c4 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png b/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png new file mode 100644 index 0000000000..c598fa0a08 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/power/power-node.png b/core/assets-raw/sprites_replacement/blocks/power/power-node.png new file mode 100644 index 0000000000..0e7296b98f Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/power/power-node.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/power/powerinfinite.png b/core/assets-raw/sprites_replacement/blocks/power/powerinfinite.png new file mode 100644 index 0000000000..f4c6473df4 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/power/powerinfinite.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/power/powervoid.png b/core/assets-raw/sprites_replacement/blocks/power/powervoid.png new file mode 100644 index 0000000000..fee2a2b3e8 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/power/powervoid.png differ diff --git a/tools/build.gradle b/tools/build.gradle index ca06848b0a..1754041c60 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -3,16 +3,16 @@ apply plugin: "java" sourceCompatibility = 1.8 sourceSets.main.java.srcDirs = [ "src/" ] - - import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.tools.texturepacker.TexturePacker import javax.imageio.ImageIO +import java.awt.image.BufferedImage def outFolder = "../core/assets-raw/sprites_out/" def genFolder = "../core/assets-raw/sprites_out/generated/" def scaling = "XBRZ 4x" +def do4 = true task swapColors(){ doLast{ @@ -47,9 +47,53 @@ task swapColors(){ } } +task scaleSprites4x(){ + doLast{ + fileTree(dir: '../core/assets-raw/sprites_out/', include: "**/*.png").visit { file -> + if(file.isDirectory() || file.toString().contains("/ui/")) return; + + for(int iteration in 0..1) { + def image = ImageIO.read(file.file) + def scaled = new BufferedImage(image.getWidth() * 2, image.getHeight() * 2, BufferedImage.TYPE_INT_ARGB) + + def getRGB = { int ix, int iy -> + return image.getRGB(Math.max(Math.min(ix, image.width - 1), 0), Math.max(Math.min(iy, image.height - 1), 0)) + } + + for (int x = 0; x < image.getWidth(); x++) { + for (int y = 0; y < image.getHeight(); y++) { + int p = image.getRGB(x, y) + int p1 = p, p2 = p, p3 = p, p4 = p + + int A = getRGB(x, y + 1), + B = getRGB(x + 1, y), + C = getRGB(x - 1, y), + D = getRGB(x, y - 1); + + if (C == A && C != D && A != B) p1 = A + if (A == B && A != C && B != D) p2 = B + if (D == C && D != B && C != A) p3 = C + if (B == D && B != A && D != C) p4 = D + + scaled.setRGB(x * 2, y * 2 + 1, p1) + scaled.setRGB(x * 2 + 1, y * 2 + 1, p2) + scaled.setRGB(x * 2, y * 2, p3) + scaled.setRGB(x * 2 + 1, y * 2, p4) + } + } + + ImageIO.write(scaled, "png", file.file) + } + } + } +} + + task scaleSprites(){ finalizedBy 'genSprites' + if(do4) dependsOn 'scaleSprites4x' + doLast{ def arguments = ["mono", "ImageResizer.exe"] @@ -62,9 +106,7 @@ task scaleSprites(){ "auto", scaling, "/save", write.toString()] } - exec{ - commandLine arguments - } + if(!do4) exec{ commandLine arguments } } } @@ -73,11 +115,15 @@ task pack(){ doLast{ + copy{ + from "../core/assets-raw/sprites_replacement/" + into "../core/assets-raw/sprites_out/" + } + TexturePacker.process("core/assets-raw/sprites_out/", "core/assets/sprites/", "sprites.atlas") delete{ - delete outFolder - delete genFolder + // delete outFolder } } }