diff --git a/.gitignore b/.gitignore index 9b1c8b1..63ee02e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /dist +/scripts/node_modules diff --git a/README.md b/README.md index ad855ae..3f5a43e 100644 --- a/README.md +++ b/README.md @@ -4,25 +4,26 @@ Replaces the default paintings with yiff. Supports 1.6+ ### Sources * [alban](https://e621.net/posts/1101130) * [aztec](https://e621.net/posts/537087) -* [aztec2](https://e621.net/post/show/426790) +* [aztec2](https://e621.net/posts/426790) * [bomb](https://e621.net/posts/1680202) * [burning_skull](https://e621.net/posts/773268) -* [bust](https://e621.net/post/show/2008022) -* [courbet](https://e621.net/post/show/1746859) +* [bust](https://e621.net/posts/2008022) +* [courbet](https://e621.net/posts/1746859) * [creebet](https://e621.net/posts/406661) -* [donkey_kong](https://e621.net/post/show/1375064) +* [donkey_kong](https://e621.net/posts/1375064) * [fighters](https://e621.net/posts/1881510) * [graham](https://e621.net/posts/1533304) * [kebab](https://e621.net/posts/1571695) -* [match](https://e621.net/post/show/1352699) +* [match](https://e621.net/posts/1352699) +* [pigscene](https://e621.net/posts/1518055) * [plant](https://e621.net/posts/1194572) * [pointer](https://e621.net/pools/8368) -* [pool](https://e621.net/post/show/854139) -* [sea left](https://e621.net/posts/405498) [sea right](https://e621.net/posts/156127) -* [skeleton](https://e621.net/post/show/979894) -* [skulls\_and\_roses](https://e621.net/post/show/1599707) -* [stage](https://e621.net/post/show/314664) -* [sunset left](https://e621.net/posts/549834) [sunset right](https://e621.net/posts/784020) +* [pool](https://e621.net/posts/854139) +* [sea](https://e621.net/posts/2939687) +* [skeleton](https://e621.net/posts/979894) +* [skulls\_and\_roses](https://e621.net/posts/1599707) +* [stage](https://e621.net/posts/314664) +* [sunset](https://e621.net/posts/2333033) * [void](https://e621.net/posts/704825) * [wanderer](https://e621.net/posts/956366) * [wasteland](https://e621.net/posts/464478) diff --git a/common-kz/assets/minecraft/textures/painting/paintings_kristoffer_zetterstrand.png b/common-kz/assets/minecraft/textures/painting/paintings_kristoffer_zetterstrand.png deleted file mode 100644 index 01ab950..0000000 --- a/common-kz/assets/minecraft/textures/painting/paintings_kristoffer_zetterstrand.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2aff2cd5d6b08fa139c197d365f778aac7e5884790e1fd1f4f78633d6b8466e9 -size 19521386 diff --git a/common/assets/minecraft/textures/painting/alban.png b/common/assets/minecraft/textures/painting/alban.png deleted file mode 100644 index c4dba60..0000000 --- a/common/assets/minecraft/textures/painting/alban.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2ff2e6e7268fd6dd26a290b0739711a899460185651e3faa3646fc58121736b -size 131553 diff --git a/common/assets/minecraft/textures/painting/aztec.png b/common/assets/minecraft/textures/painting/aztec.png deleted file mode 100644 index f082e0f..0000000 --- a/common/assets/minecraft/textures/painting/aztec.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59dd80ba969a922a152ec27b88e82da1194c1574ac7aa30db1048dcbf9e13976 -size 151493 diff --git a/common/assets/minecraft/textures/painting/aztec2.png b/common/assets/minecraft/textures/painting/aztec2.png deleted file mode 100644 index eebd22e..0000000 --- a/common/assets/minecraft/textures/painting/aztec2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1814f40b126f1b7c6b4ebb293e556d87857ae760b70f77368aa698cddea2739a -size 220707 diff --git a/common/assets/minecraft/textures/painting/bomb.png b/common/assets/minecraft/textures/painting/bomb.png deleted file mode 100644 index 1500454..0000000 --- a/common/assets/minecraft/textures/painting/bomb.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16752917dc8f5522408b0238dfbf3914148e465f120704db0081edbc17b1121e -size 271735 diff --git a/common/assets/minecraft/textures/painting/burning_skull.png b/common/assets/minecraft/textures/painting/burning_skull.png deleted file mode 100755 index 0bc28b8..0000000 --- a/common/assets/minecraft/textures/painting/burning_skull.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e87c31e3a308cd1677257de189c84e195fae8cf0914f4c17c0eab3922deb9c21 -size 23569830 diff --git a/common/assets/minecraft/textures/painting/burning_skull.png.mcmeta b/common/assets/minecraft/textures/painting/burning_skull.png.mcmeta deleted file mode 100755 index 4f0718a..0000000 --- a/common/assets/minecraft/textures/painting/burning_skull.png.mcmeta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "animation": {} -} \ No newline at end of file diff --git a/common/assets/minecraft/textures/painting/bust.png b/common/assets/minecraft/textures/painting/bust.png deleted file mode 100644 index 9187530..0000000 --- a/common/assets/minecraft/textures/painting/bust.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea470daf4d8a8c2e8ae4b3a493cd7394db5f0d9f1adf4be207b79a48a26eca8b -size 1372472 diff --git a/common/assets/minecraft/textures/painting/courbet.png b/common/assets/minecraft/textures/painting/courbet.png deleted file mode 100644 index f138c70..0000000 --- a/common/assets/minecraft/textures/painting/courbet.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c010cb106a1848480fa5df37232234e5be146f22cea633cae2be7819b81622bf -size 672853 diff --git a/common/assets/minecraft/textures/painting/creebet.png b/common/assets/minecraft/textures/painting/creebet.png deleted file mode 100644 index ca19f7e..0000000 --- a/common/assets/minecraft/textures/painting/creebet.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eee71f98fbcea17c05bae6263b653d09d3473fcd28ed6bda0d57354e2ed34215 -size 230437 diff --git a/common/assets/minecraft/textures/painting/donkey_kong.png b/common/assets/minecraft/textures/painting/donkey_kong.png deleted file mode 100644 index 63eb773..0000000 --- a/common/assets/minecraft/textures/painting/donkey_kong.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93421f68dc3cc1ccaeb504eeb2a5a7f67d993073b91ef97e34f9b3d7e5710abc -size 1033258 diff --git a/common/assets/minecraft/textures/painting/fighters.png b/common/assets/minecraft/textures/painting/fighters.png deleted file mode 100644 index 3622ac4..0000000 --- a/common/assets/minecraft/textures/painting/fighters.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae40f9f0717741597acd6d842ec40dc75f398460cee9b86c8a0b3aa0158a3674 -size 643803 diff --git a/common/assets/minecraft/textures/painting/graham.png b/common/assets/minecraft/textures/painting/graham.png deleted file mode 100644 index 1709e4c..0000000 --- a/common/assets/minecraft/textures/painting/graham.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0720911ecf1169233370399ca753a8f21b6cbbeb9b99794bf6400ede26e683ac -size 38009035 diff --git a/common/assets/minecraft/textures/painting/graham.png.mcmeta b/common/assets/minecraft/textures/painting/graham.png.mcmeta deleted file mode 100755 index 4f0718a..0000000 --- a/common/assets/minecraft/textures/painting/graham.png.mcmeta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "animation": {} -} \ No newline at end of file diff --git a/common/assets/minecraft/textures/painting/kebab.png b/common/assets/minecraft/textures/painting/kebab.png deleted file mode 100644 index 9b90702..0000000 --- a/common/assets/minecraft/textures/painting/kebab.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2823d9a583522fcd2df1c86b12eedfa34972b45400c64856dd27daa7a19166a -size 1920280 diff --git a/common/assets/minecraft/textures/painting/kebab.png.mcmeta b/common/assets/minecraft/textures/painting/kebab.png.mcmeta deleted file mode 100755 index 7e77c64..0000000 --- a/common/assets/minecraft/textures/painting/kebab.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 2 - } -} \ No newline at end of file diff --git a/common/assets/minecraft/textures/painting/match.png b/common/assets/minecraft/textures/painting/match.png deleted file mode 100644 index 8e3757d..0000000 --- a/common/assets/minecraft/textures/painting/match.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a43da43957d4ef96a25e898285dd46e2adba8f3d7dcb664c5fa8b8aa5b32cd8 -size 559766 diff --git a/common/assets/minecraft/textures/painting/pigscene.png b/common/assets/minecraft/textures/painting/pigscene.png deleted file mode 100644 index 461f400..0000000 --- a/common/assets/minecraft/textures/painting/pigscene.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1bf489b5605864385372a3647d3b23f834324819f40c5f1e92ddfe067cf3f3e6 -size 1234898 diff --git a/common/assets/minecraft/textures/painting/plant.png b/common/assets/minecraft/textures/painting/plant.png deleted file mode 100644 index 2e72eb6..0000000 --- a/common/assets/minecraft/textures/painting/plant.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d14d4335e4d65daff1bc6a91116f97855e4235026a806e37a2a56d75a65a915 -size 13711901 diff --git a/common/assets/minecraft/textures/painting/plant.png.mcmeta b/common/assets/minecraft/textures/painting/plant.png.mcmeta deleted file mode 100755 index 4f0718a..0000000 --- a/common/assets/minecraft/textures/painting/plant.png.mcmeta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "animation": {} -} \ No newline at end of file diff --git a/common/assets/minecraft/textures/painting/pointer.png b/common/assets/minecraft/textures/painting/pointer.png deleted file mode 100644 index 1003309..0000000 --- a/common/assets/minecraft/textures/painting/pointer.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b25846c468d1ee5fce738efb91db9bf08f018b624edbdd2bc3a9ac8c27ea6cd -size 9196758 diff --git a/common/assets/minecraft/textures/painting/pointer.png.mcmeta b/common/assets/minecraft/textures/painting/pointer.png.mcmeta deleted file mode 100755 index 2e22c04..0000000 --- a/common/assets/minecraft/textures/painting/pointer.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 100 - } -} \ No newline at end of file diff --git a/common/assets/minecraft/textures/painting/pool.png b/common/assets/minecraft/textures/painting/pool.png deleted file mode 100644 index a0bde1d..0000000 --- a/common/assets/minecraft/textures/painting/pool.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa2388de7a193e9bd480870473b69eea7aeb90244db05bbc8d306015e1212094 -size 703294 diff --git a/common/assets/minecraft/textures/painting/sea.png b/common/assets/minecraft/textures/painting/sea.png deleted file mode 100644 index 173ef75..0000000 --- a/common/assets/minecraft/textures/painting/sea.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09864310b1386b4069dafc535ad2bf73bebb418b4477b0e7a24000b457524ffa -size 483854 diff --git a/common/assets/minecraft/textures/painting/skeleton.png b/common/assets/minecraft/textures/painting/skeleton.png deleted file mode 100644 index f3055dc..0000000 --- a/common/assets/minecraft/textures/painting/skeleton.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bee098b4dc853545dc4020c69908dd84d34e9d9c60fd2ab5e9bad37c7ccfa33e -size 875684 diff --git a/common/assets/minecraft/textures/painting/skull_and_roses.png b/common/assets/minecraft/textures/painting/skull_and_roses.png deleted file mode 100644 index 1b66bab..0000000 --- a/common/assets/minecraft/textures/painting/skull_and_roses.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42fc008e100dce0f85d4c81c2246fc99b2c91d1802fd8eec90772c032024c569 -size 896188 diff --git a/common/assets/minecraft/textures/painting/stage.png b/common/assets/minecraft/textures/painting/stage.png deleted file mode 100644 index 3217026..0000000 --- a/common/assets/minecraft/textures/painting/stage.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:208a8a0892ee65c836b620116322ac0e1263df9c2f6e91ea7c704b3e67176194 -size 1037810 diff --git a/common/assets/minecraft/textures/painting/sunset.png b/common/assets/minecraft/textures/painting/sunset.png deleted file mode 100644 index da352b1..0000000 --- a/common/assets/minecraft/textures/painting/sunset.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a287eaab7e88567297cce618d6623eb730e3abac8e6a4c7cea01abcddf5e5f40 -size 578024 diff --git a/common/assets/minecraft/textures/painting/void.png b/common/assets/minecraft/textures/painting/void.png deleted file mode 100644 index 79e9db8..0000000 --- a/common/assets/minecraft/textures/painting/void.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:567720b652f9033de04263b4b988793192ae0ce8571079b54e9c5ad9b968c353 -size 1017700 diff --git a/common/assets/minecraft/textures/painting/wanderer.png b/common/assets/minecraft/textures/painting/wanderer.png deleted file mode 100644 index ab184d1..0000000 --- a/common/assets/minecraft/textures/painting/wanderer.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:990cfe5d702824df1117a3e1dbfb4b35058fc39355e1c2b95091cacc666edfea -size 5006817 diff --git a/common/assets/minecraft/textures/painting/wanderer.png.mcmeta b/common/assets/minecraft/textures/painting/wanderer.png.mcmeta deleted file mode 100755 index e551bc6..0000000 --- a/common/assets/minecraft/textures/painting/wanderer.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 2 - } -} \ No newline at end of file diff --git a/common/assets/minecraft/textures/painting/wasteland.png b/common/assets/minecraft/textures/painting/wasteland.png deleted file mode 100644 index cf8cceb..0000000 --- a/common/assets/minecraft/textures/painting/wasteland.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e5367b995ee66124be923b244b04784bcf2145417cff9bc1f20dabac3ea6888 -size 353354 diff --git a/common/assets/minecraft/textures/painting/wither.png b/common/assets/minecraft/textures/painting/wither.png deleted file mode 100644 index bc034e5..0000000 --- a/common/assets/minecraft/textures/painting/wither.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ace7780b6fc1793eedb2101434f2f5535d27cb573a6f9d4cd56381178f8a66d -size 3175233 diff --git a/data-kz/assets/minecraft/textures/painting/paintings_kristoffer_zetterstrand.png b/data-kz/assets/minecraft/textures/painting/paintings_kristoffer_zetterstrand.png new file mode 100644 index 0000000..864c920 --- /dev/null +++ b/data-kz/assets/minecraft/textures/painting/paintings_kristoffer_zetterstrand.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7054b9a50f691970ffcc165d3c52ebedfbb53f9f0076e7469990b3eb9f55fb1 +size 79983851 diff --git a/common-kz/pack.png b/data-kz/pack.png similarity index 100% rename from common-kz/pack.png rename to data-kz/pack.png diff --git a/data/assets/minecraft/textures/painting/alban.png b/data/assets/minecraft/textures/painting/alban.png new file mode 100644 index 0000000..ae79a8a --- /dev/null +++ b/data/assets/minecraft/textures/painting/alban.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f7d455b63f8aa50867f3ada42005f49720302c00b40125dfaa231e4018d0585 +size 625775 diff --git a/data/assets/minecraft/textures/painting/aztec.png b/data/assets/minecraft/textures/painting/aztec.png new file mode 100644 index 0000000..95974b7 --- /dev/null +++ b/data/assets/minecraft/textures/painting/aztec.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5eb0ddcb56f059a5e6988c800532aaa71b5cf1c324ea8f992326b2c3af212db +size 633998 diff --git a/data/assets/minecraft/textures/painting/aztec2.png b/data/assets/minecraft/textures/painting/aztec2.png new file mode 100644 index 0000000..07e5056 --- /dev/null +++ b/data/assets/minecraft/textures/painting/aztec2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3b993daba01e382a533e5943498d8f1edaed63f479b01d989d140cda3f5ed2b +size 602566 diff --git a/data/assets/minecraft/textures/painting/bomb.png b/data/assets/minecraft/textures/painting/bomb.png new file mode 100644 index 0000000..3fcb96e --- /dev/null +++ b/data/assets/minecraft/textures/painting/bomb.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd8e48c37de5727efaeb8b2e5c632b98bce35424ce6efe77fcd8d5fcaa672648 +size 684837 diff --git a/data/assets/minecraft/textures/painting/burning_skull.png b/data/assets/minecraft/textures/painting/burning_skull.png new file mode 100644 index 0000000..e54a47c --- /dev/null +++ b/data/assets/minecraft/textures/painting/burning_skull.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eac63e4d4ceaef01c21a4d798a4e7ad31e9ed8430f8d64994064fe2eb87a415a +size 5646431 diff --git a/data/assets/minecraft/textures/painting/burning_skull.png.mcmeta b/data/assets/minecraft/textures/painting/burning_skull.png.mcmeta new file mode 100644 index 0000000..728d0aa --- /dev/null +++ b/data/assets/minecraft/textures/painting/burning_skull.png.mcmeta @@ -0,0 +1 @@ +{"animation":{}} \ No newline at end of file diff --git a/data/assets/minecraft/textures/painting/bust.png b/data/assets/minecraft/textures/painting/bust.png new file mode 100644 index 0000000..3649b8b --- /dev/null +++ b/data/assets/minecraft/textures/painting/bust.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12ba7beac4b839f2bc287c01a7d8e89dc0a4b8b43ab19dbdfbad7f949faaa67c +size 2354754 diff --git a/data/assets/minecraft/textures/painting/courbet.png b/data/assets/minecraft/textures/painting/courbet.png new file mode 100644 index 0000000..c314e31 --- /dev/null +++ b/data/assets/minecraft/textures/painting/courbet.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3c0be3fbe1224ecf2fa2c6d5694967723e6742417425d7f69c884d381fa4c71 +size 1280164 diff --git a/data/assets/minecraft/textures/painting/creebet.png b/data/assets/minecraft/textures/painting/creebet.png new file mode 100644 index 0000000..ea7ea26 --- /dev/null +++ b/data/assets/minecraft/textures/painting/creebet.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71a7ddc3ad3939176b46ab1af49f6db5c094e2013440eba67df102488f1e463a +size 490313 diff --git a/data/assets/minecraft/textures/painting/donkey_kong.png b/data/assets/minecraft/textures/painting/donkey_kong.png new file mode 100644 index 0000000..2bf3681 --- /dev/null +++ b/data/assets/minecraft/textures/painting/donkey_kong.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c36c642e2abc8d6141cae327fc9396778f3186fd068e915151b5b148657ec204 +size 4023613 diff --git a/data/assets/minecraft/textures/painting/fighters.png b/data/assets/minecraft/textures/painting/fighters.png new file mode 100644 index 0000000..c0bc6a0 --- /dev/null +++ b/data/assets/minecraft/textures/painting/fighters.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:187ab87660fd17c82d0eb8de29e615c98222c00ac17e9e8f855d4aba465acf7a +size 4770578 diff --git a/data/assets/minecraft/textures/painting/graham.png b/data/assets/minecraft/textures/painting/graham.png new file mode 100644 index 0000000..0ab6ee5 --- /dev/null +++ b/data/assets/minecraft/textures/painting/graham.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db5444059580abdd7aa804fab79469018e0b7a82e933c76011bdb984c1ac39b4 +size 41714611 diff --git a/data/assets/minecraft/textures/painting/graham.png.mcmeta b/data/assets/minecraft/textures/painting/graham.png.mcmeta new file mode 100644 index 0000000..728d0aa --- /dev/null +++ b/data/assets/minecraft/textures/painting/graham.png.mcmeta @@ -0,0 +1 @@ +{"animation":{}} \ No newline at end of file diff --git a/data/assets/minecraft/textures/painting/kebab.png b/data/assets/minecraft/textures/painting/kebab.png new file mode 100644 index 0000000..efa1b51 --- /dev/null +++ b/data/assets/minecraft/textures/painting/kebab.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8dd9e8b7ba50ff005f869fd650e2a3893cd9e7797bfae00640affc5270f336a9 +size 2907543 diff --git a/data/assets/minecraft/textures/painting/kebab.png.mcmeta b/data/assets/minecraft/textures/painting/kebab.png.mcmeta new file mode 100644 index 0000000..cc0cf14 --- /dev/null +++ b/data/assets/minecraft/textures/painting/kebab.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"frametime":2}} \ No newline at end of file diff --git a/data/assets/minecraft/textures/painting/match.png b/data/assets/minecraft/textures/painting/match.png new file mode 100644 index 0000000..0f93ca9 --- /dev/null +++ b/data/assets/minecraft/textures/painting/match.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:577a8fc982eb600e68c680dd142162156b1df936c7bf86f2e4ec01f33890a628 +size 982865 diff --git a/data/assets/minecraft/textures/painting/pigscene.png b/data/assets/minecraft/textures/painting/pigscene.png new file mode 100644 index 0000000..9bb6e99 --- /dev/null +++ b/data/assets/minecraft/textures/painting/pigscene.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efeb43d9ccb1db70c1150fcc2c18c6f33e7263a470784a4fcbdfdd28443515ea +size 8014537 diff --git a/data/assets/minecraft/textures/painting/plant.png b/data/assets/minecraft/textures/painting/plant.png new file mode 100644 index 0000000..c4be507 --- /dev/null +++ b/data/assets/minecraft/textures/painting/plant.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ab6ac18131f820a9aaee8e6460c4dd01d477446358add386d4cee4aedcafeba +size 12693439 diff --git a/data/assets/minecraft/textures/painting/plant.png.mcmeta b/data/assets/minecraft/textures/painting/plant.png.mcmeta new file mode 100644 index 0000000..728d0aa --- /dev/null +++ b/data/assets/minecraft/textures/painting/plant.png.mcmeta @@ -0,0 +1 @@ +{"animation":{}} \ No newline at end of file diff --git a/data/assets/minecraft/textures/painting/pointer.png b/data/assets/minecraft/textures/painting/pointer.png new file mode 100644 index 0000000..f4c42fb --- /dev/null +++ b/data/assets/minecraft/textures/painting/pointer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f8e06761514b3787933477294cc9fa83ce7f8eeff9be10b61ef8ad28c510986 +size 12673520 diff --git a/data/assets/minecraft/textures/painting/pointer.png.mcmeta b/data/assets/minecraft/textures/painting/pointer.png.mcmeta new file mode 100644 index 0000000..b86159c --- /dev/null +++ b/data/assets/minecraft/textures/painting/pointer.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"frametime":100}} \ No newline at end of file diff --git a/data/assets/minecraft/textures/painting/pool.png b/data/assets/minecraft/textures/painting/pool.png new file mode 100644 index 0000000..70f8fde --- /dev/null +++ b/data/assets/minecraft/textures/painting/pool.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7baf4bba73bb9eeb7cab93eea154a75736788e3a11b232e84a70804510793c14 +size 1582275 diff --git a/data/assets/minecraft/textures/painting/sea.png b/data/assets/minecraft/textures/painting/sea.png new file mode 100644 index 0000000..c1bb450 --- /dev/null +++ b/data/assets/minecraft/textures/painting/sea.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abf1539ee008c0bf01c54e95cbd5b5c22b7df11952cbc86a93bc2b67a91b7fea +size 502069 diff --git a/data/assets/minecraft/textures/painting/skeleton.png b/data/assets/minecraft/textures/painting/skeleton.png new file mode 100644 index 0000000..c54dada --- /dev/null +++ b/data/assets/minecraft/textures/painting/skeleton.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eadf17271527339cb1a95f59a7c3226cf5aa1f4a9d3bd160078ce72e5e7c9a4f +size 11704860 diff --git a/data/assets/minecraft/textures/painting/skull_and_roses.png b/data/assets/minecraft/textures/painting/skull_and_roses.png new file mode 100644 index 0000000..32ac161 --- /dev/null +++ b/data/assets/minecraft/textures/painting/skull_and_roses.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1c5432b733faa52e8e99ffcb40d99f6083729e62efd0974c4d092d5c2848efe +size 2624214 diff --git a/data/assets/minecraft/textures/painting/stage.png b/data/assets/minecraft/textures/painting/stage.png new file mode 100644 index 0000000..34fbf95 --- /dev/null +++ b/data/assets/minecraft/textures/painting/stage.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65d319b504fbf8397587521cedf54a821e064d3099f697820e711d46bf3abf51 +size 1698284 diff --git a/data/assets/minecraft/textures/painting/sunset.png b/data/assets/minecraft/textures/painting/sunset.png new file mode 100644 index 0000000..25d61e3 --- /dev/null +++ b/data/assets/minecraft/textures/painting/sunset.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64640ab5375b87729518c031f42d6a8968387a3ff4e396a70beaed0763b4717a +size 392818 diff --git a/data/assets/minecraft/textures/painting/void.png b/data/assets/minecraft/textures/painting/void.png new file mode 100644 index 0000000..3853b88 --- /dev/null +++ b/data/assets/minecraft/textures/painting/void.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a08910678e2757cb319d108dc8ad07dda7c3bd9fb87d7824408f19e031f9a74 +size 1619111 diff --git a/data/assets/minecraft/textures/painting/wanderer.png b/data/assets/minecraft/textures/painting/wanderer.png new file mode 100644 index 0000000..c4db402 --- /dev/null +++ b/data/assets/minecraft/textures/painting/wanderer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba4b85927ec44dcf241e8b139b313cf5f8a27967d44d0d54312ca69804293607 +size 6147615 diff --git a/data/assets/minecraft/textures/painting/wanderer.png.mcmeta b/data/assets/minecraft/textures/painting/wanderer.png.mcmeta new file mode 100644 index 0000000..728d0aa --- /dev/null +++ b/data/assets/minecraft/textures/painting/wanderer.png.mcmeta @@ -0,0 +1 @@ +{"animation":{}} \ No newline at end of file diff --git a/data/assets/minecraft/textures/painting/wasteland.png b/data/assets/minecraft/textures/painting/wasteland.png new file mode 100644 index 0000000..83b750c --- /dev/null +++ b/data/assets/minecraft/textures/painting/wasteland.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a8b39c9769f401c34b2a610c37fefd80da76d0c4402baff1a2eef74ee58b222 +size 707663 diff --git a/data/assets/minecraft/textures/painting/wither.png b/data/assets/minecraft/textures/painting/wither.png new file mode 100644 index 0000000..d906072 --- /dev/null +++ b/data/assets/minecraft/textures/painting/wither.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:092151179b3217254b5c4b6eed7b73c36f55710114e634cae9cf89160e46f219 +size 1087332 diff --git a/common/pack.png b/data/pack.png similarity index 100% rename from common/pack.png rename to data/pack.png diff --git a/frame.png b/frame.png deleted file mode 100644 index 2e21e51..0000000 --- a/frame.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ace76421f8eb815bf72594f33157028502cb119400da118d54018e04dbb9b485 -size 28724 diff --git a/images/alban.png b/images/alban.png new file mode 100644 index 0000000..d3ca707 --- /dev/null +++ b/images/alban.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:706f7becedeb394653659fccab4f4b7e56e1f1ce59ea3b8e00d3543c9590158d +size 950944 diff --git a/images/aztec.png b/images/aztec.png new file mode 100644 index 0000000..1dc70f3 --- /dev/null +++ b/images/aztec.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b86a180e4e22c84502a20845262c18c62dcbd38201dfb5e7ac260b537f46914c +size 607365 diff --git a/images/aztec2.jpg b/images/aztec2.jpg new file mode 100644 index 0000000..2626112 --- /dev/null +++ b/images/aztec2.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abf1fa8f54abae69ea552338ad8fe5e9ef4f9d686f5b2ac4b40828cc5bfe4c7f +size 147755 diff --git a/images/bomb.png b/images/bomb.png new file mode 100644 index 0000000..e7d649c --- /dev/null +++ b/images/bomb.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94cca0ddef5952b6911c4cc5486e8ad3308b16431c552bd2c3bc80be678fb5e8 +size 955902 diff --git a/images/burning_skull.webm b/images/burning_skull.webm new file mode 100644 index 0000000..6f222ce --- /dev/null +++ b/images/burning_skull.webm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f779b4f42ea7bf3e70e327045ad00cfb2deeda09d098405b164cbcbc64e17908 +size 102681596 diff --git a/images/bust.jpg b/images/bust.jpg new file mode 100644 index 0000000..2ed2d7e --- /dev/null +++ b/images/bust.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d322861af4b28efd48979edb240c1fb55c7ed57803961bcbf25a4d58210774f3 +size 1669904 diff --git a/images/courbet.png b/images/courbet.png new file mode 100644 index 0000000..e9f5c53 --- /dev/null +++ b/images/courbet.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d47aa696b901b46a3563336210d0cdf3bb75b4ea935235afe81fea9a7d6d14a +size 1480426 diff --git a/images/creebet.png b/images/creebet.png new file mode 100644 index 0000000..dc8de38 --- /dev/null +++ b/images/creebet.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:790eee0edbae45e8c71478af6ca36a49dbdae54f81c18f1e22e4e181bbbb8e96 +size 739174 diff --git a/images/donkey_kong.png b/images/donkey_kong.png new file mode 100644 index 0000000..e9fa9b4 --- /dev/null +++ b/images/donkey_kong.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d0cb75b399001afad27ad0a67b4373313d64a1e572c703e703914ebef06d3e9 +size 1187771 diff --git a/images/fighters.png b/images/fighters.png new file mode 100644 index 0000000..c597771 --- /dev/null +++ b/images/fighters.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be0ee8983a2a94489b763abdbcb64a204a3b5b0f2e06022ed49439ecfbb0d1a0 +size 2129310 diff --git a/images/graham.gif b/images/graham.gif new file mode 100644 index 0000000..a68b756 --- /dev/null +++ b/images/graham.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c965e5b6a400ac806d12f1393e1c4418929b0e2cd9988a0d582446d867ff288e +size 6120331 diff --git a/images/images.json b/images/images.json new file mode 100644 index 0000000..d5c2d68 --- /dev/null +++ b/images/images.json @@ -0,0 +1,276 @@ +{ + "sizes": { + "1x1": [640, 640], + "1x2": [640, 1280], + "2x1": [1280, 640], + "2x2": [1280, 1280], + "3x3": [1920, 1920], + "3x4": [1920, 2560], + "4x2": [2560, 1280], + "4x3": [2560, 1920], + "4x4": [2560, 2560] + }, + "images": [ + { + "name": "kebab", + "size": "1x1", + "kz": [0, 0], + "animation": { "frametime": 2 } + }, + { + "name": "aztec", + "size": "1x1", + "kz": [1, 0] + }, + { + "name": "alban", + "size": "1x1", + "kz": [2, 0] + }, + { + "name": "aztec2", + "size": "1x1", + "kz": [3, 0] + }, + { + "name": "bomb", + "size": "1x1", + "kz": [4, 0] + }, + { + "name": "plant", + "size": "1x1", + "kz": [5, 0] + }, + { + "name": "wasteland", + "size": "1x1", + "kz": [6, 0] + }, + { + "name": "meditation", + "size": "1x1", + "kz": null + }, + { + "name": "pool", + "size": "2x1", + "kz": [0, 2] + }, + { + "name": "courbet", + "size": "2x1", + "kz": [2, 2] + }, + { + "name": "sunset", + "size": "2x1", + "kz": [4, 2] + }, + { + "name": "sea", + "size": "2x1", + "kz": [6, 2] + }, + { + "name": "creebet", + "size": "2x1", + "kz": [8, 2] + }, + { + "name": "wanderer", + "size": "1x2", + "kz": [0, 4], + "resize": [640, 640], + "_comment": "For some reason this needs to be 1:1" + }, + { + "name": "graham", + "size": "1x2", + "kz": [1, 4], + "resize": [640, 640], + "_comment": "For some reason this needs to be 1:1" + }, + { + "name": "prairie_ride", + "size": "1x2", + "kz": null, + "resize": [640, 640], + "_comment": "For some reason this needs to be 1:1" + }, + { + "name": "fighters", + "size": "4x2", + "kz": [0, 6] + }, + { + "name": "changing", + "size": "4x2", + "kz": null + }, + { + "name": "finding", + "size": "4x2", + "kz": null + }, + { + "name": "lowmist", + "size": "4x2", + "kz": null + }, + { + "name": "passage", + "size": "4x2", + "kz": null + }, + { + "name": "match", + "size": "2x2", + "kz": [0, 8] + }, + { + "name": "bust", + "size": "2x2", + "kz": [2, 8] + }, + { + "name": "stage", + "size": "2x2", + "kz": [4, 8] + }, + { + "name": "void", + "size": "2x2", + "kz": [6, 8] + }, + { + "name": "skull_and_roses", + "size": "2x2", + "kz": [8, 8] + }, + { + "name": "wither", + "size": "2x2", + "kz": [10, 8] + }, + { + "name": "baroque", + "size": "2x2", + "kz": null + }, + { + "name": "humble", + "size": "2x2", + "kz": null + }, + { + "name": "earth", + "size": "2x2", + "kz": null + }, + { + "name": "wind", + "size": "2x2", + "kz": null + }, + { + "name": "fire", + "size": "2x2", + "kz": null + }, + { + "name": "water", + "size": "2x2", + "kz": null + }, + { + "name": "pointer", + "size": "4x4", + "kz": [0, 12], + "resize": [640, 640], + "animation": { "frametime": 100 } + }, + { + "name": "pigscene", + "size": "4x4", + "kz": [4, 12] + }, + { + "name": "burning_skull", + "size": "4x4", + "kz": [8, 12], + "resize": [640, 640], + "frames": [2805, 2826] + }, + { + "name": "unpacked", + "size": "4x4", + "kz": null + }, + { + "name": "orb", + "size": "4x4", + "kz": null + }, + { + "name": "skeleton", + "size": "4x3", + "kz": [12, 4] + }, + { + "name": "donkey_kong", + "size": "4x3", + "kz": [12, 7] + }, + { + "name": "bouquet", + "size": "3x3", + "kz": null + }, + { + "name": "cavebird", + "size": "3x3", + "kz": null + }, + { + "name": "cotan", + "size": "3x3", + "kz": null + }, + { + "name": "endboss", + "size": "3x3", + "kz": null + }, + { + "name": "fern", + "size": "3x3", + "kz": null + }, + { + "name": "owlemons", + "size": "3x3", + "kz": null + }, + { + "name": "sunflowers", + "size": "3x3", + "kz": null + }, + { + "name": "tides", + "size": "3x3", + "kz": null + }, + { + "name": "backyard", + "size": "3x4", + "kz": null + }, + { + "name": "pond", + "size": "3x4", + "kz": null + } + ] +} diff --git a/images/kebab.webm b/images/kebab.webm new file mode 100644 index 0000000..84a974a --- /dev/null +++ b/images/kebab.webm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb9fd58bec266db3e8673171c41e77713b235c876e7bb8cfa94b5f645e0b96e9 +size 236011 diff --git a/images/match.png b/images/match.png new file mode 100644 index 0000000..b9408a8 --- /dev/null +++ b/images/match.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92d59b0963b3cc0fd4663deaf0b457ec64ec89fa477f31ec042b7d2024eb17fd +size 459584 diff --git a/images/pigscene.png b/images/pigscene.png new file mode 100644 index 0000000..d9c2d40 --- /dev/null +++ b/images/pigscene.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0418e5f15f8eeb8d02572313b436a26a571350807f14b0ef90d189110482d70 +size 1456200 diff --git a/images/plant.gif b/images/plant.gif new file mode 100644 index 0000000..e0f8ee8 --- /dev/null +++ b/images/plant.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c48b069bc9de242b0325af188ed204ad6947ecc1f1c8768da05a9cc672cd3e46 +size 2784340 diff --git a/images/pointer/0001.png b/images/pointer/0001.png new file mode 100644 index 0000000..a5826df --- /dev/null +++ b/images/pointer/0001.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67a01f6b3b9d35d79d3c420f6c79b7bc44abd9f68ed7a6705314c0866ab0c39a +size 594808 diff --git a/images/pointer/0002.png b/images/pointer/0002.png new file mode 100644 index 0000000..c97d5b4 --- /dev/null +++ b/images/pointer/0002.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7837f04da7f5d8ab0a4798be1aa55f1d7ff406e6b93ede31d90ffd42c116b6f7 +size 600923 diff --git a/images/pointer/0003.png b/images/pointer/0003.png new file mode 100644 index 0000000..366ff34 --- /dev/null +++ b/images/pointer/0003.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:755494f5bb14f574335067b3caa396c74d535c1399773a807f71c013d80df054 +size 854608 diff --git a/images/pointer/0004.png b/images/pointer/0004.png new file mode 100644 index 0000000..32d3c9d --- /dev/null +++ b/images/pointer/0004.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6bd80e40782e7426a3707a8a3f2bc0eb6e0fc4929bc3aabe74b41f9d024ca0c +size 682606 diff --git a/images/pointer/0005.png b/images/pointer/0005.png new file mode 100644 index 0000000..ec0c234 --- /dev/null +++ b/images/pointer/0005.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d80feae7553be8c471e5be872720692919167f855352fcbebe270ed7eafb404 +size 673299 diff --git a/images/pointer/0006.png b/images/pointer/0006.png new file mode 100644 index 0000000..183f6fe --- /dev/null +++ b/images/pointer/0006.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ab365c01445914a7bb0e643a4b48510d768d9eb6cc4dc7dd6ea2d483373f14d +size 796613 diff --git a/images/pointer/0007.png b/images/pointer/0007.png new file mode 100644 index 0000000..3e0bceb --- /dev/null +++ b/images/pointer/0007.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddc5b6f65c575321ecf59dfc6d70ebfe33a87ea1ba06a860054a647a2f3ab040 +size 635699 diff --git a/images/pointer/0008.png b/images/pointer/0008.png new file mode 100644 index 0000000..7f89a34 --- /dev/null +++ b/images/pointer/0008.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d0e4e6fcf2ed9bb3590c5329cd2c965361f3baa5541e963f35f9d03815725b2 +size 661944 diff --git a/images/pointer/0009.png b/images/pointer/0009.png new file mode 100644 index 0000000..66f2a89 --- /dev/null +++ b/images/pointer/0009.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3055a73d0c793de9dc3dcab0da34fa7fe97e85f8bcb257d14cc293966fe4b2cd +size 556615 diff --git a/images/pointer/0010.png b/images/pointer/0010.png new file mode 100644 index 0000000..1c397dd --- /dev/null +++ b/images/pointer/0010.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2fbe0a8dce2d47f776229e5423b8254fa9070c81a34c2e0348281fa4d712367 +size 647659 diff --git a/images/pointer/0011.png b/images/pointer/0011.png new file mode 100644 index 0000000..fb2b25d --- /dev/null +++ b/images/pointer/0011.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1944e08132f20e72a6f45a811422f3fd08fcc7e7c245873d164af2de7d413819 +size 548986 diff --git a/images/pointer/0012.png b/images/pointer/0012.png new file mode 100644 index 0000000..ed9308e --- /dev/null +++ b/images/pointer/0012.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc66e9364507a9ef18dcaacda4fb509fe162e8e50e25e3a3d563b930a21b7ecb +size 623930 diff --git a/images/pointer/0013.png b/images/pointer/0013.png new file mode 100644 index 0000000..e1e8b52 --- /dev/null +++ b/images/pointer/0013.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c440e3ba24382966c96b450e1cfe58d859724abd641fc2f481af2eab34474041 +size 879738 diff --git a/images/pointer/0014.png b/images/pointer/0014.png new file mode 100644 index 0000000..38fa57c --- /dev/null +++ b/images/pointer/0014.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7738f6833c5ecefe8c2dd709e5fb5f9995b48d886f7095a8d47d2a58cd146c01 +size 732928 diff --git a/images/pointer/0015.png b/images/pointer/0015.png new file mode 100644 index 0000000..8004dc2 --- /dev/null +++ b/images/pointer/0015.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:274bfa40eaa74bee084f69d4cf38360b3a8c59649dd362aed9a64fa5ecff11ee +size 766585 diff --git a/images/pointer/0016.png b/images/pointer/0016.png new file mode 100644 index 0000000..f75e28c --- /dev/null +++ b/images/pointer/0016.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c1b59edb46ce2fffc787d28dac40679ede0d9098a6e012859f67a513d2a4e06 +size 614038 diff --git a/images/pointer/0017.png b/images/pointer/0017.png new file mode 100644 index 0000000..2741a5e --- /dev/null +++ b/images/pointer/0017.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92ff9d600ac5efe90f40872700a22c8481651ad6e367cc5d878134eb278b70c2 +size 653554 diff --git a/images/pointer/0018.png b/images/pointer/0018.png new file mode 100644 index 0000000..09b670c --- /dev/null +++ b/images/pointer/0018.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37b7879a9eae275313b47ac812e224eb00e279b082574be5e7ec6f3d2e53c5e8 +size 740819 diff --git a/images/pointer/0019.png b/images/pointer/0019.png new file mode 100644 index 0000000..9bdc2f0 --- /dev/null +++ b/images/pointer/0019.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c09b70de9dad16c1e4dd074b3900272beff3bd979914d13def0da0771cea46cb +size 828576 diff --git a/images/pointer/0020.png b/images/pointer/0020.png new file mode 100644 index 0000000..513b4c2 --- /dev/null +++ b/images/pointer/0020.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbb4220a6bf0e51643715310b878aaa20ebde6fc12a3b34d9b8bde3bc0013f1d +size 700375 diff --git a/images/pointer/0021.png b/images/pointer/0021.png new file mode 100644 index 0000000..9ae34c1 --- /dev/null +++ b/images/pointer/0021.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16c9505afa14a0ee4eed5ab82af0ee93b8c0da345faeed0922423c09bf1a5e74 +size 644792 diff --git a/images/pointer/0022.png b/images/pointer/0022.png new file mode 100644 index 0000000..c60a65f --- /dev/null +++ b/images/pointer/0022.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b62f681fc2d617b800e8c858491610ce88f039e249552b989c380f4b226c749f +size 668280 diff --git a/images/pointer/0023.png b/images/pointer/0023.png new file mode 100644 index 0000000..3722332 --- /dev/null +++ b/images/pointer/0023.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa154c18bc849d358d3e23544dd9a5e9c013598dd31a95750bdc5527dc9a30a4 +size 784915 diff --git a/images/pool.jpg b/images/pool.jpg new file mode 100644 index 0000000..0478e38 --- /dev/null +++ b/images/pool.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03b3d6b4ef3dfcb64e7ed476e6a543c3b7eb5aed60016fc1e555954364c3e035 +size 179887 diff --git a/images/sea.png b/images/sea.png new file mode 100644 index 0000000..7b5ed2c --- /dev/null +++ b/images/sea.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:218b4be66b9c34ebbc81d3f186ce95fd09ce5392f482be6fc1c99792826ac700 +size 2514576 diff --git a/images/skeleton.png b/images/skeleton.png new file mode 100644 index 0000000..297a46e --- /dev/null +++ b/images/skeleton.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9852ad149a2560d9e0572d06fcc61778a7a215c49bdfdf235e5620741b147d41 +size 4648427 diff --git a/images/skull_and_roses.png b/images/skull_and_roses.png new file mode 100644 index 0000000..e90ae33 --- /dev/null +++ b/images/skull_and_roses.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71a794ba04a0390315b700e5a09d0dce35c4053b976cf08138d2d1fa782de8e9 +size 8107766 diff --git a/images/stage.png b/images/stage.png new file mode 100644 index 0000000..4d38b56 --- /dev/null +++ b/images/stage.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fc7c6bf63d7602d77224a3c16acad0ee57b786f01abc2d795089832a420f360 +size 608743 diff --git a/images/sunset.png b/images/sunset.png new file mode 100644 index 0000000..73c8e30 --- /dev/null +++ b/images/sunset.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f51ba00e284f860cf1af6263336380701ab9625557e9e31e506b7290888d66a +size 1184314 diff --git a/images/test.json b/images/test.json new file mode 100644 index 0000000..3873c03 --- /dev/null +++ b/images/test.json @@ -0,0 +1,22 @@ +{ + "sizes": { + "1x1": [640, 640], + "1x2": [640, 1280], + "2x1": [1280, 640], + "2x2": [1280, 1280], + "3x3": [1920, 1920], + "3x4": [1920, 2560], + "4x2": [2560, 1280], + "4x3": [2560, 1920], + "4x4": [2560, 2560] + }, + "images": [ + { + "name": "burning_skull", + "size": "4x4", + "kz": [8, 12], + "resize": [620, 620], + "frames": [2805, 2826] + } + ] +} diff --git a/images/void.jpg b/images/void.jpg new file mode 100644 index 0000000..d8f1c2a --- /dev/null +++ b/images/void.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f292e001df9ecc9f4d1683d41d00b386c7cb8627752c1af9d523df638cfd12a7 +size 3165868 diff --git a/images/wanderer.gif b/images/wanderer.gif new file mode 100644 index 0000000..a548222 --- /dev/null +++ b/images/wanderer.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90ce40eca9081738f175d659d9e40980fedd697a7f4e9767cd80dfb18746c5e8 +size 4859142 diff --git a/images/wasteland.png b/images/wasteland.png new file mode 100644 index 0000000..4ccedd2 --- /dev/null +++ b/images/wasteland.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dd9352bdae221145aae675084421265d48ceac92cc6d95dd4c84d014e18becd +size 1084826 diff --git a/images/wither.png b/images/wither.png new file mode 100644 index 0000000..edd3548 --- /dev/null +++ b/images/wither.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b13bfdbb93ebb8df052a7c50248c1413850e4cd2c7491a982f9ee742d4a95f11 +size 3542660 diff --git a/info.json b/info.json index 82f207f..f73c04f 100644 --- a/info.json +++ b/info.json @@ -3,8 +3,8 @@ "description": "Replaces the ingame paintings with furry porn.", "url": "https://git.furry.cool/MCFurryPacks/YiffyPaintings", "versions": [ - ["1.6", 1], - ["1.9", 2], + ["1.06", 1], + ["1.09", 2], ["1.11", 3], ["1.13", 4], ["1.14", 4], @@ -22,9 +22,9 @@ ], "exports": [], "overrides": { - "1.6": { "common": "common-kz" }, - "1.9": { "common": "common-kz" }, - "1.11": { "common": "common-kz" }, - "1.13": { "common": "common-kz" } + "1.06": { "data": "data-kz" }, + "1.09": { "data": "data-kz" }, + "1.11": { "data": "data-kz" }, + "1.13": { "data": "data-kz" } } } diff --git a/kz.png b/kz.png new file mode 100644 index 0000000..637ef5a --- /dev/null +++ b/kz.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:607c53d41ebbc3f0383d3d8c84c7c3b6d87a3eb14413ba9aa09266e48d5bbd63 +size 441707 diff --git a/scripts/.eslintrc.json b/scripts/.eslintrc.json new file mode 100644 index 0000000..a78a956 --- /dev/null +++ b/scripts/.eslintrc.json @@ -0,0 +1,8 @@ +{ + "extends": ["@uwu-codes/eslint-config/esm"], + "rules": { + "unicorn/prevent-abbreviations": "off", + "unicorn/no-process-exit": "off", + "unicorn/import-style": "off" + } +} diff --git a/scripts/bun.lockb b/scripts/bun.lockb new file mode 100755 index 0000000..f967a06 Binary files /dev/null and b/scripts/bun.lockb differ diff --git a/scripts/common.ts b/scripts/common.ts new file mode 100644 index 0000000..acbd26c --- /dev/null +++ b/scripts/common.ts @@ -0,0 +1,194 @@ +import { randomBytes } from "crypto"; +import { fileTypeFromBuffer } from "file-type"; +import Ffmpeg from "fluent-ffmpeg"; +import { rm } from "fs/promises"; +import { readdir } from "fs/promises"; +import { mkdtemp } from "fs/promises"; +import { tmpdir } from "os"; +import { basename } from "path"; +import sharp, { type OverlayOptions, type Sharp } from "sharp"; + +export async function formatImage(name: string, image: string | string[], frameColors: number[], framePercent: number, width: number, height: number, resizeWidth?: number, resizeHeight?: number, frames?: [start: number, end: number], saveKz?: boolean) { + saveKz ??= false; + const originalWidth = width, originalHeight = height; + const originalFrameVH = Math.floor(Math.min(originalWidth, originalHeight) * framePercent); + const originalInputWidth = originalWidth - (originalFrameVH * 2), originalInputHeight = originalHeight - (originalFrameVH * 2); + if (resizeWidth && resizeHeight) { + width = resizeWidth; + height = resizeHeight; + } + const frameVH = Math.floor(Math.min(width, height) * framePercent); + const inputWidth = width - (frameVH * 2), inputHeight = height - (frameVH * 2); + const isImage = !Array.isArray(image) && ["image/png", "image/jpeg"].includes((await fileTypeFromBuffer(Buffer.isBuffer(image) ? image : await Bun.file(image).arrayBuffer()))!.mime); + let result: Sharp, kzFile: string | null | true = null; + const frame = await createFrame(frameColors, framePercent, width, height); + if (isImage) { + result = await sharp(frame) + .composite([{ + input: await sharp(image).resize(inputWidth, inputHeight, { fit: "fill" }).toBuffer(), + top: frameVH, + left: frameVH + }]) + .resize(width, height, { fit: "fill" }); + kzFile = true as const; + } else { + let tmpDir: string | undefined; + + let files: string[] = []; + tmpDir = await mkdtemp(`${tmpdir()}/split-frames-`); + if (!Array.isArray(image)) { + const [start = 0, end = null] = frames ?? []; + console.debug("Input file %s is not an image, assuming we need to extract frames.", name); + await new Promise((resolve) => { + Ffmpeg(image) + .videoFilter(`scale=${inputWidth}:${inputHeight}${end !== null ? `,select='gte(n\\, ${start})*lte(n\\,${end})'` : ""}`) + .addOption("-vsync vfr") + .output(`${tmpDir}/frame%04d.png`) + .on("end", async() => { + files = (await readdir(tmpDir!)).filter(f => /frame\d+\.png/.test(f)).sort().map(f => `${tmpDir}/${f}`); + if (files.length === 0) { + console.error("No frames extracted for %s.", name); + if (tmpDir) { + await rm(tmpDir, { recursive: true }); + } + process.exit(1); + } + console.log("Frames extracted to %s, %d total for %s", tmpDir, files.length, name); + resolve(); + }) + .on("error", async() => { + if (tmpDir) { + await rm(tmpDir, { recursive: true }); + } + console.error("Failed to extract frames for %s.", name); + process.exit(1); + }) + .run() + }); + } else { + for (const img of image) { + await sharp(img).resize(inputWidth, inputHeight, { fit: "fill" }).toFile(`${tmpDir}/${basename(img)}`); + } + files = image.map(f => `${tmpDir}/${basename(f)}`).sort(); + } + + const parts: OverlayOptions[] = []; + for (const img of files) { + const i = files.indexOf(img); + console.log("Processing %s (%d/%d) for %s", img, i + 1, files.length, name); + const imgFile = await sharp(img).resize(inputWidth, inputHeight, { fit: "fill" }).toBuffer(); + if (saveKz && !kzFile && (files.length < 5 || i >= 5)) { + const ogFile = await sharp(img).resize(originalInputWidth, originalInputHeight, { fit: "fill" }).toBuffer(); + kzFile = `${tmpdir()}/${randomBytes(8).toString("hex")}-kz.png`; + await sharp(await sharp(frame).resize(originalWidth, originalHeight, { fit: "fill" }).toBuffer()).composite([{ input: ogFile, top: originalFrameVH, left: originalFrameVH }]).resize(originalWidth, originalHeight, { fit: "fill" }).toFile(kzFile); + } + parts.push( + { input: frame, top: i * height, left: 0 }, + { input: imgFile, top: (i * height) + frameVH, left: frameVH } + ); + } + + result = await sharp({ + create: { + width, + height: height * files.length, + channels: 4, + background: { r: 0, g: 0, b: 0, alpha: 0 } + }, + limitInputPixels: false + }) + .composite(parts) + if (tmpDir) { + await rm(tmpDir, { recursive: true }); + } + } + return { isImage, result, kzFile }; +} + +const frameSizePercent = 0.1; +async function createFrame(colors: number[], percent: number, width: number, height: number) { + let frameW = width, frameH = height, i = 0; + const parts: OverlayOptions[] = []; + const frameVH = Math.floor(Math.min(width, height) * percent); + while (frameW > 0) { + if (i > colors.length - 1) { + i = 0; + } + const color = colors[i], r = (color >> 16) & 0xFF, g = (color >> 8) & 0xFF, b = color & 0xFF, + w = width * frameSizePercent, h = frameVH; + parts.push({ + input: { + create: { + width: w, + height: h, + channels: 4, + background: { r, g, b, alpha: 255 } + } + }, + top: 0, + // left to right + left: i * w + }, + { + input: { + create: { + width: w, + height: h, + channels: 4, + background: { r, g, b, alpha: 255 } + } + }, + top: frameH - h, + // right to left + left: width - (i + 1) * w + }); + frameW -= w; + i += 1; + } + i = 0; + colors = colors.toReversed(); + while (frameH > 0) { + if (i > colors.length - 1) { + i = 0; + } + const color = colors[i], r = (color >> 16) & 0xFF, g = (color >> 8) & 0xFF, b = color & 0xFF, + w = frameVH, h = height * frameSizePercent; + parts.push({ + input: { + create: { + width: w, + height: h, + channels: 4, + background: { r, g, b, alpha: 255 } + } + }, + top: i * h, + // top to bottom + left: 0 + }, + { + input: { + create: { + width: w, + height: h, + channels: 4, + background: { r, g, b, alpha: 255 } + } + }, + top: height - (i + 1) * h, + // bottom to top + left: width - w + }); + frameH -= h; + i += 1; + } + return sharp({ + create: { + width, + height, + channels: 4, + background: { r: 0, g: 0, b: 0, alpha: 0 } + }, + limitInputPixels: false + }).composite(parts).png().toBuffer(); +} diff --git a/scripts/images.ts b/scripts/images.ts new file mode 100755 index 0000000..29e0807 --- /dev/null +++ b/scripts/images.ts @@ -0,0 +1,136 @@ +import type { PathLike } from "fs"; +import { access } from "fs/promises"; +import { dirname, resolve } from "path"; +import sharp from "sharp"; +import { parseArgs } from "util"; +import { formatImage } from "./common"; +import { readFile } from "fs/promises"; +import { writeFile } from "fs/promises"; +import { rm } from "fs/promises"; +import { mkdir } from "fs/promises"; +import { stat } from "fs/promises"; +import { readdir } from "fs/promises"; + +const { values: args } = parseArgs({ + args: Bun.argv, + options: { + images: { + type: "string", + short: "i", + default: "images/images.json" + }, + imagedir: { + type: "string", + short: "d", + default: "images" + }, + outdir: { + type: "string", + short: "o", + default: "data" + }, + kzoutdir: { + type: "string", + short: "k", + default: "data-kz" + }, + kzfile: { + type: "string", + default: "kz.png" + }, + throw: { + type: "boolean", + short: "t", + default: false + } + }, + strict: true, + allowPositionals: true +}); + +const dirExists = async(path: PathLike) => access(path).then(() => true, () => false); +const imagesPath = resolve(args.images ?? "images.json"); +const imageDir = resolve(args.imagedir ?? dirname(imagesPath)); +const outDir = resolve(args.outdir ?? "data"); +const kzFile = resolve(args.kzfile ?? "frames/kz.png"); +const kzOutDir = resolve(args.kzoutdir ?? "data-kz"); +const framePercent = 0.03125; +const frameColors = [0xA47627, 0xA45226, 0x944421, 0xAC581D, 0x8C341C, 0xAC641D, 0xAB6C25, 0xA44424, 0xAC572C, 0xAC4C24, 0xA87824]; +const throwOnMissing = !!args.throw; +if (!await dirExists(imageDir)) { + console.error("Image directory %s does not exist.", imageDir); + process.exit(1); +} + +if (!await Bun.file(kzFile).exists()) { + console.error("Kz file %s does not exist.", kzFile); + process.exit(1); +} + +const ap = (p: string) => resolve(p, "assets/minecraft/textures/painting"); +await rm(`${outDir}/assets`, { recursive: true, force: true }); +await rm(`${kzOutDir}/assets`, { recursive: true, force: true }); +await mkdir(ap(outDir), { recursive: true }); +await mkdir(ap(kzOutDir), { recursive: true }); + +interface Image { + animation?: { frametime?: number; }; + frames?: [start: number, end: number]; + kz: [x: number, y: number] | null; + name: string; + resize?: [width: number, height: number]; + size: string; +} + +interface Images { + images: Array; + sizes: Record; +} + +const images = await Bun.file(imagesPath).json() as Images; +const [baseWidth, baseHeight] = images.sizes["1x1"]; + +const kzCleanup: string[] = []; +let kz = await sharp(kzFile, { limitInputPixels: false }).toBuffer(); +for (const image of images.images) { + let img: string | string[]; + if (await stat(`${imageDir}/${image.name}`).then(s => s.isDirectory(), () => false)) { + img = await readdir(`${imageDir}/${image.name}`).then(files => files.map(f => `${imageDir}/${image.name}/${f}`).sort()); + } else { + const [file] = await Array.fromAsync(new Bun.Glob(`${image.name}.*`).scan({ onlyFiles: true, cwd: imageDir })); + if (!file) { + console.error("Image %s does not exist.", image.name); + if (throwOnMissing) { + process.exit(1); + } + continue; + } + img = `${imageDir}/${file}` + } + console.log("Processing %s", image.name); + + const [resizeWidth, resizeHeight] = image.resize ?? []; + const { isImage, result, kzFile } = await formatImage(image.name, img, frameColors, framePercent, ...images.sizes[image.size], resizeWidth, resizeHeight, image.frames, image.kz !== null); + await result.toFile(`${ap(outDir)}/${image.name}.png`); + if (!isImage) { + await writeFile(`${ap(outDir)}/${image.name}.png.mcmeta`, JSON.stringify({ animation: image.animation ?? {} })); + } + + if (image.kz && kzFile !== null) { + kz = await sharp(kz) + .composite([{ + input: await sharp(kzFile === true ? `${ap(outDir)}/${image.name}.png` : kzFile).resize(images.sizes[image.size][0], images.sizes[image.size][1]).toBuffer(), + top: baseHeight * image.kz[1], + left: baseWidth * image.kz[0] + }]) + .toBuffer(); + if (kzFile !== true) { + kzCleanup.push(kzFile); + } + } +} + +await sharp(kz).toFile(`${ap(kzOutDir)}/paintings_kristoffer_zetterstrand.png`); +for (const file of kzCleanup) { + await rm(file); +} diff --git a/scripts/package.json b/scripts/package.json new file mode 100644 index 0000000..0e55735 --- /dev/null +++ b/scripts/package.json @@ -0,0 +1,26 @@ +{ + "name": "image-maker", + "module": "index.ts", + "type": "module", + "devDependencies": { + "@types/bun": "latest", + "@types/fluent-ffmpeg": "^2.1.24", + "@types/node": "^20.12.13", + "@uwu-codes/eslint-config": "^1.1.28", + "eslint": "^9.3.0" + }, + "peerDependencies": { + "typescript": "^5.0.0" + }, + "dependencies": { + "file-type": "^19.0.0", + "fluent-ffmpeg": "^2.1.3", + "sharp": "^0.33.4" + }, + "scripts": { + "compile": "bun build ./images.ts --compile --outfile bin/make-images" + }, + "bin": { + "make-images": "./images.ts" + } +} diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json new file mode 100644 index 0000000..dcd8fc5 --- /dev/null +++ b/scripts/tsconfig.json @@ -0,0 +1,22 @@ +{ + "compilerOptions": { + "lib": ["ESNext"], + "target": "ESNext", + "module": "ESNext", + "moduleDetection": "force", + "jsx": "react-jsx", + "allowJs": true, + + /* Bundler mode */ + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "verbatimModuleSyntax": true, + "noEmit": true, + + /* Linting */ + "skipLibCheck": true, + "strict": true, + "noFallthroughCasesInSwitch": true, + "forceConsistentCasingInFileNames": true + } +}