diff --git a/README.md b/README.md
index 61f688b..9a0acdc 100644
--- a/README.md
+++ b/README.md
@@ -1,74 +1,118 @@
# Yiffy Paintings
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/posts/426790)
-* [bomb](https://e621.net/posts/1680202)
-* [burning_skull](https://e621.net/posts/773268)
-* [bust](https://e621.net/posts/2008022)
-* [courbet](https://e621.net/posts/1746859)
-* [creebet](https://e621.net/posts/406661)
-* [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/posts/1352699)
-* [pigscene](https://e621.net/posts/1518055)
-* [plant](https://e621.net/posts/1194572)
-* [pointer](https://e621.net/pools/8368)
-* [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)
-* [wither](https://e621.net/posts/1683783)
-* [water](https://e621.net/posts/2827630)
-* [fire](https://e621.net/posts/2984756)
-* [earth](https://e621.net/posts/4394369)
-* [wind](https://e621.net/posts/4025061)
-
### Examples
1x1
+
+* [kebab](https://e621.net/posts/1571695)
+* [aztec](https://e621.net/posts/537087)
+* [alban](https://e621.net/posts/1101130)
+* [aztec2](https://e621.net/posts/426790)
+* [bomb](https://e621.net/posts/1680202)
+* [plant](https://e621.net/posts/1194572)
+* [wasteland](https://e621.net/posts/464478)
+* [meditative](https://e621.net/posts/3355209) (1.21+)
+
1x2
+
+* [wanderer](https://e621.net/posts/956366)
+* [graham](https://e621.net/posts/1533304)
+* [prairie_ride](https://e621.net/posts/4005374) (1.21+)
+
2x1
+
+* [pool](https://e621.net/posts/854139)
+* [courbet](https://e621.net/posts/1746859)
+* [sunset](https://e621.net/posts/2333033)
+* [sea](https://e621.net/posts/2939687)
+* [creebet](https://e621.net/posts/406661)
+
2x2
+
+* [match](https://e621.net/posts/1352699)
+* [bust](https://e621.net/posts/2008022)
+* [stage](https://e621.net/posts/314664)
+* [void](https://e621.net/posts/704825)
+* [skull\_and\_roses](https://e621.net/posts/1599707)
+* [wither](https://e621.net/posts/1683783)
+* [baroque](https://e621.net/posts/4524310) (1.21+)
+* [humble](https://e621.net/posts/3293255) (1.21+)
+* [earth](https://e621.net/posts/4394369) (1.19+)
+* [wind](https://e621.net/posts/4025061) (1.19+)
+* [fire](https://e621.net/posts/2984756) (1.19+)
+* [water](https://e621.net/posts/2827630) (1.19+)
+
-Water, Fire, Earth, Wind - [22w16a+ (1.19+)](https://minecraft.wiki/w/Painting#Unused_paintings)
-
+
+
+
+3x3
+
+* [bouquet](https://e621.net/posts/4420140) (1.21+)
+* [cavebird](https://e621.net/posts/2433070) (1.21+)
+* [cotan](https://e621.net/posts/2255060) (1.21+)
+* [endboss](https://e621.net/posts/4543670) (1.21+)
+* [fern](https://e621.net/posts/1339799) (1.21+)
+* [owlemons](https://e621.net/posts/4623032) (1.21+)
+* [sunflowers](https://e621.net/posts/4626501) (1.21+)
+* [tides](https://e621.net/posts/4642340) (1.21+)
+
+
+
+
+
+3x4
+
+* [backyard](https://e621.net/posts/4155856) (1.21+)
+* [pond](https://e621.net/posts/3935565) (1.21+)
+
+
4x2
+
+* [fighters](https://e621.net/posts/1881510)
+* [changing](https://e621.net/posts/3317590) (1.21+)
+* [finding](https://e621.net/posts/1818640) (1.21+)
+* [lowmist](https://e621.net/posts/1345861) (1.21+)
+* [passage](https://e621.net/posts/4152001) (1.21+)
+
4x3
+
+* [skeleton](https://e621.net/posts/979894)
+* [donkey_kong](https://e621.net/posts/1375064)
+
4x4
+
+* [burning_skull](https://e621.net/posts/773268)
+* [pigscene](https://e621.net/posts/1518055)
+* [pointer](https://e621.net/pools/8368)
+* [unpacked](https://e621.net/posts/3543944) (1.21+)
+* [orb](https://e621.net/posts/2626566) (1.21+)
+
diff --git a/data-kz/assets/minecraft/textures/painting/paintings_kristoffer_zetterstrand.png b/data-kz/assets/minecraft/textures/painting/paintings_kristoffer_zetterstrand.png
index 4bca81d..7d7527c 100644
--- a/data-kz/assets/minecraft/textures/painting/paintings_kristoffer_zetterstrand.png
+++ b/data-kz/assets/minecraft/textures/painting/paintings_kristoffer_zetterstrand.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e44eef7ffdc4ec3af41f1eb4ffd746e1ae72ab326753fe0b2fb65cb0ca4ebca8
-size 20528430
+oid sha256:7ac2fb1930807d6187199ee64e1c534ec9ed5385d367ae3f03bfd00c36634405
+size 20524407
diff --git a/data/assets/minecraft/textures/painting/backyard.png b/data/assets/minecraft/textures/painting/backyard.png
new file mode 100644
index 0000000..64538d1
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/backyard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9f1890b5511796ca6c28a90da96e4c6fe99b63d707520b8ab50b986ce24593a
+size 1306271
diff --git a/data/assets/minecraft/textures/painting/backyard.png.mcmeta b/data/assets/minecraft/textures/painting/backyard.png.mcmeta
new file mode 100644
index 0000000..4f73ffa
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/backyard.png.mcmeta
@@ -0,0 +1 @@
+{"animation":{"frametime":3}}
\ No newline at end of file
diff --git a/data/assets/minecraft/textures/painting/baroque.png b/data/assets/minecraft/textures/painting/baroque.png
new file mode 100644
index 0000000..6358c26
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/baroque.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cdf8f11a97eb5a9ab42339e160dc95d82dc865cff22a07d8596a5c826ef5c89
+size 8582915
diff --git a/data/assets/minecraft/textures/painting/baroque.png.mcmeta b/data/assets/minecraft/textures/painting/baroque.png.mcmeta
new file mode 100644
index 0000000..728d0aa
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/baroque.png.mcmeta
@@ -0,0 +1 @@
+{"animation":{}}
\ No newline at end of file
diff --git a/data/assets/minecraft/textures/painting/bouquet.png b/data/assets/minecraft/textures/painting/bouquet.png
new file mode 100644
index 0000000..4b30418
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/bouquet.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69abaf092afca334e57c598adefe99cd62c487fd9cc2ab977bf67612d2bc9816
+size 914915
diff --git a/data/assets/minecraft/textures/painting/cavebird.png b/data/assets/minecraft/textures/painting/cavebird.png
new file mode 100644
index 0000000..b1d94f0
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/cavebird.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0b7e06a9696d136b9860d924828c10564dc6f9b2fd93ed0822a8dcd49cbd706
+size 980705
diff --git a/data/assets/minecraft/textures/painting/changing.png b/data/assets/minecraft/textures/painting/changing.png
new file mode 100644
index 0000000..ef44cfe
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/changing.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:524c81f260ab7cab75955a555a1323e5ca73083b153f3e6839da59eb4047550c
+size 438399
diff --git a/data/assets/minecraft/textures/painting/cotan.png b/data/assets/minecraft/textures/painting/cotan.png
new file mode 100644
index 0000000..7246fc2
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/cotan.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2b42e002ce68f7fc9f5216e12edec6ebb125350be3df3d901fe6fe9e3dac655
+size 1285399
diff --git a/data/assets/minecraft/textures/painting/endboss.png b/data/assets/minecraft/textures/painting/endboss.png
new file mode 100644
index 0000000..574327c
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/endboss.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b449ac95f12a30c0e5aa1387b9a27ec1b70c6a693dae1c627581ff45d56c05d7
+size 828511
diff --git a/data/assets/minecraft/textures/painting/fern.png b/data/assets/minecraft/textures/painting/fern.png
new file mode 100644
index 0000000..d048a0c
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/fern.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca38ab82b4f27020557244f122b7a2bc3b6c220dd2241676ff17b4b501db111b
+size 1255692
diff --git a/data/assets/minecraft/textures/painting/finding.png b/data/assets/minecraft/textures/painting/finding.png
new file mode 100644
index 0000000..33373f3
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/finding.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b450ae868d0784b7cbb6a35b8429234d139d840a16395872fb992307016eb2a
+size 1119590
diff --git a/data/assets/minecraft/textures/painting/graham.png b/data/assets/minecraft/textures/painting/graham.png
index 27ace41..29c55af 100644
--- a/data/assets/minecraft/textures/painting/graham.png
+++ b/data/assets/minecraft/textures/painting/graham.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:861d5de3709b04f6d3198cf55ccee90a0a07af1bcb58f844d1e4044530ec3d7e
-size 11411509
+oid sha256:b4a72a4ca7c5e897aa583d970a2c93a5dc3a75a1022735a9e528cc5bad9c7cfa
+size 3868475
diff --git a/data/assets/minecraft/textures/painting/humble.png b/data/assets/minecraft/textures/painting/humble.png
new file mode 100644
index 0000000..2498ff5
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/humble.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:647246c2542a184e7548e280bbee1804e34a38df3f52b66324ecc1fde337a050
+size 367228
diff --git a/data/assets/minecraft/textures/painting/kebab.png b/data/assets/minecraft/textures/painting/kebab.png
index 2c31da3..47e7853 100644
--- a/data/assets/minecraft/textures/painting/kebab.png
+++ b/data/assets/minecraft/textures/painting/kebab.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:06f2d5259577091b25e925af0184760a474e995c769d43fcf64d06323f474fcc
-size 880059
+oid sha256:d497ceaa52fba00442e5e150eb06f2da3570cf79debc4cccebc301746a35b38e
+size 833528
diff --git a/data/assets/minecraft/textures/painting/lowmist.png b/data/assets/minecraft/textures/painting/lowmist.png
new file mode 100644
index 0000000..d4538d2
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/lowmist.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:381af1f45b0382f3f612cb7e6a251468b5a9b194cfb0ff6f1c60884d0ff8bca8
+size 1074526
diff --git a/data/assets/minecraft/textures/painting/meditative.png b/data/assets/minecraft/textures/painting/meditative.png
new file mode 100644
index 0000000..3b45eb8
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/meditative.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28b0c4e3fb6c960502ead9950899ce178c1eda5b5a24f365c0fd94fea48d489a
+size 6655055
diff --git a/data/assets/minecraft/textures/painting/meditative.png.mcmeta b/data/assets/minecraft/textures/painting/meditative.png.mcmeta
new file mode 100644
index 0000000..728d0aa
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/meditative.png.mcmeta
@@ -0,0 +1 @@
+{"animation":{}}
\ No newline at end of file
diff --git a/data/assets/minecraft/textures/painting/orb.png b/data/assets/minecraft/textures/painting/orb.png
new file mode 100644
index 0000000..771c7c1
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/orb.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d19a561473e3fd88070837a90aeb48fbafc383940e0a070cd1e4da8a7553185
+size 1610477
diff --git a/data/assets/minecraft/textures/painting/owlemons.png b/data/assets/minecraft/textures/painting/owlemons.png
new file mode 100644
index 0000000..105808b
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/owlemons.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e5636f59630dd8c520b8b682cbb0d9af1b3d073c116644a6bfa13e1254c1f3a
+size 1473169
diff --git a/data/assets/minecraft/textures/painting/passage.png b/data/assets/minecraft/textures/painting/passage.png
new file mode 100644
index 0000000..f44a2b8
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/passage.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b984b55c1bbcb128aa2dfd0655f56aa430a5fb50eb86a3233f71eee1396ecc68
+size 1122506
diff --git a/data/assets/minecraft/textures/painting/plant.png b/data/assets/minecraft/textures/painting/plant.png
index 0972297..3e09f19 100644
--- a/data/assets/minecraft/textures/painting/plant.png
+++ b/data/assets/minecraft/textures/painting/plant.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:06a84d34a292528570253c3a73e243f9c5c05df3d2987e88d132a49bb7eae8f8
-size 2861757
+oid sha256:09aa2bc5f2effb7e92207b55285d36c1bf5c72660abe1e5e1d252b7a38ca25e1
+size 2783098
diff --git a/data/assets/minecraft/textures/painting/pond.png b/data/assets/minecraft/textures/painting/pond.png
new file mode 100644
index 0000000..3e3265a
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/pond.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1852df0bd6f2ee075cf8b3308b8cb0142b1351b25c428dc576e506cd7e2a6066
+size 2166960
diff --git a/data/assets/minecraft/textures/painting/prairie_ride.png b/data/assets/minecraft/textures/painting/prairie_ride.png
new file mode 100644
index 0000000..4635b80
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/prairie_ride.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d86625ed0a82a746e287fcbd54a312e2159f240e035d14516ab33020a2850916
+size 103914
diff --git a/data/assets/minecraft/textures/painting/sunflowers.png b/data/assets/minecraft/textures/painting/sunflowers.png
new file mode 100644
index 0000000..72edaf7
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/sunflowers.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e614a923a2a63cf895738d58fd3b2c71029a9f6c958b409d72f05fc87315b4d
+size 698763
diff --git a/data/assets/minecraft/textures/painting/tides.png b/data/assets/minecraft/textures/painting/tides.png
new file mode 100644
index 0000000..fef6fe1
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/tides.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1862efc81dc4a3e7064c45707525397878302787bb705b63717a06ad5ed12da3
+size 1231276
diff --git a/data/assets/minecraft/textures/painting/unpacked.png b/data/assets/minecraft/textures/painting/unpacked.png
new file mode 100644
index 0000000..6c4c15a
--- /dev/null
+++ b/data/assets/minecraft/textures/painting/unpacked.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02882bb814407558a0aea12c1858ae9db908865c8f3f911b8b45f2413721e955
+size 1590071
diff --git a/data/assets/minecraft/textures/painting/wanderer.png b/data/assets/minecraft/textures/painting/wanderer.png
index a4d5c20..3e45c1f 100644
--- a/data/assets/minecraft/textures/painting/wanderer.png
+++ b/data/assets/minecraft/textures/painting/wanderer.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:733d03888807ea0ad4cb26169486a9bcad83b2c64d6672957597dfbdd968d7ac
-size 2379966
+oid sha256:65041161c748b3b5d89bb8d77bca04f396065fc7a988db9df6dbba83485b389c
+size 2264881
diff --git a/examples/1x1.png b/examples/1x1.png
index 41c9ba2..fc2a975 100644
--- a/examples/1x1.png
+++ b/examples/1x1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fe97144545b518ce361f9eea08fbebaa073fcdfa6ac0c846406fb2244a2195df
-size 878660
+oid sha256:db2bf5d300ed7cea4349d502545d6623773cc71a94374ad67e4cac51c0e0b587
+size 1027590
diff --git a/examples/1x2.png b/examples/1x2.png
index 36eee07..8f67b94 100644
--- a/examples/1x2.png
+++ b/examples/1x2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7cf4f20aa92cc4fb2961c285c0771ddacc103d62153856aa5f273c4ffba221fc
-size 526041
+oid sha256:ef7949ab53b10358a88f1681491b884875e3213b09c5055ad3db9f60f34bda4c
+size 550270
diff --git a/examples/2x1.png b/examples/2x1.png
index d74ba73..a817cbc 100644
--- a/examples/2x1.png
+++ b/examples/2x1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e3b32dd8fd5c9d04d50842111d8dbdb74629cb59cf0a15996ad34f8bea569aac
-size 1211614
+oid sha256:0db27854ab878377a2f0fb1fbd4c1da61ebece2cb24f846c903cdcb4b3867d03
+size 1015053
diff --git a/examples/2x2-wfew.png b/examples/2x2-wfew.png
deleted file mode 100644
index b3726ba..0000000
--- a/examples/2x2-wfew.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eedf10c44345fc7936496752812cce624274fd0b9902b523da41f05ea1282bcf
-size 1259318
diff --git a/examples/2x2.png b/examples/2x2.png
index a49332c..09b63ad 100644
--- a/examples/2x2.png
+++ b/examples/2x2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f4bc1e9d92d714601ebeff5f371048ff4fa24bade227907d34c080d3d5886f50
-size 1272132
+oid sha256:916dbc9dbe51a6d5ae26245db88265fa9ad564ae1a1f24ed9a04372f04a13bd5
+size 1257474
diff --git a/examples/3x3.png b/examples/3x3.png
new file mode 100644
index 0000000..92994bd
--- /dev/null
+++ b/examples/3x3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fc5edc423b48d0fddb10420323853d3d130c909705e126ec045800ffa20e8e4
+size 1283057
diff --git a/examples/3x4.png b/examples/3x4.png
new file mode 100644
index 0000000..ea73fca
--- /dev/null
+++ b/examples/3x4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4615c4406a04f3011e09b7d318167ae09aa0a9ea004ca30a44f6f3978379d11c
+size 904600
diff --git a/examples/4x2.png b/examples/4x2.png
index 0d08646..aaa20d9 100644
--- a/examples/4x2.png
+++ b/examples/4x2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a3dc6abc02fba4752f134a0264469c09ce1bef2383492a5d0801aa1798f96adb
-size 688459
+oid sha256:b818e3ca8b1925c0bc56fb9e6779caef3f3d89a6f27aac4c6ce4ea0116de4c2e
+size 1073884
diff --git a/examples/4x3.png b/examples/4x3.png
index 5127d4c..b77d73a 100644
--- a/examples/4x3.png
+++ b/examples/4x3.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3ac149dc72c41a96f3dbfd48e996b369d717fc2ffff3bde02ee5948de3e0a812
-size 1096359
+oid sha256:52ba9c0ead64556227dd7218ee38150fc82455117ce261105e55e2f8c0154805
+size 1062468
diff --git a/examples/4x4.png b/examples/4x4.png
index 7e1f6af..8f2a88e 100644
--- a/examples/4x4.png
+++ b/examples/4x4.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f85ebca50d773d0ca414451bfb4023e4f6fef7c45615c9015d9a4e708e6cda1b
-size 1004337
+oid sha256:5f17b89b16f7af6f6b7b023398f06969dd215667ba7f632c566d018de430c3c6
+size 1280001
diff --git a/images/backyard.webm b/images/backyard.webm
new file mode 100644
index 0000000..3587381
--- /dev/null
+++ b/images/backyard.webm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e2ef3f34f56bc978580617a4448fe0bd300de8057abaa50e5548e70ef91eb99
+size 1516841
diff --git a/images/baroque.webm b/images/baroque.webm
new file mode 100644
index 0000000..2fc3dc8
--- /dev/null
+++ b/images/baroque.webm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9c30157f9fbc47474b133763762938e335525e7949b87c17b777792b571d47c
+size 4697136
diff --git a/images/bouquet.png b/images/bouquet.png
new file mode 100644
index 0000000..55a1f0f
--- /dev/null
+++ b/images/bouquet.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc2d8932c9c32357b942e2cd0127267e8b0a166b953af9ca4314ef07d5f8944e
+size 1378330
diff --git a/images/cavebird.jpg b/images/cavebird.jpg
new file mode 100644
index 0000000..9791d3f
--- /dev/null
+++ b/images/cavebird.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e030231ee1c981c052debdefbeb62843b063be2d6c206cb83bcd52a7b346f78
+size 281934
diff --git a/images/changing.png b/images/changing.png
new file mode 100644
index 0000000..b15f0d4
--- /dev/null
+++ b/images/changing.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e83683ff7b06712e7f8b4074b80eb60bfb9ab74186e92d6aa9eee550c1a59bb2
+size 191587
diff --git a/images/cotan.png b/images/cotan.png
new file mode 100644
index 0000000..0ec4efa
--- /dev/null
+++ b/images/cotan.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6617dd20767fcd647807a98bc77e3fd5e470084fa54331e7be4525f05689622
+size 1943435
diff --git a/images/endboss.png b/images/endboss.png
new file mode 100644
index 0000000..27055a2
--- /dev/null
+++ b/images/endboss.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97bde9ebe1c7432766016bb114b343e9ab78af3cf38c0336b732e6e4d7f5ff02
+size 4122256
diff --git a/images/fern.jpg b/images/fern.jpg
new file mode 100644
index 0000000..127effe
--- /dev/null
+++ b/images/fern.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f637588aaceac45aedf36211435b11c891fd44fd5d3e10662a984f1122dba02
+size 515144
diff --git a/images/finding.jpg b/images/finding.jpg
new file mode 100644
index 0000000..0570e49
--- /dev/null
+++ b/images/finding.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5d6cda345db557454bcf0c9e4c1e85f29ae829c475fefdf02590a6429ffadef
+size 797162
diff --git a/images/humble.png b/images/humble.png
new file mode 100644
index 0000000..e6753f2
--- /dev/null
+++ b/images/humble.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5f6403b860112585480ccbefd98cd250acf8684a97a86492f458ae1c8a15cff
+size 4298719
diff --git a/images/images.json b/images/images.json
index c0cb1c5..09deb3e 100644
--- a/images/images.json
+++ b/images/images.json
@@ -48,7 +48,7 @@
"kz": [6, 0]
},
{
- "name": "meditation",
+ "name": "meditative",
"size": "1x1",
"kz": null
},
@@ -89,6 +89,7 @@
"size": "1x2",
"kz": [1, 4],
"resize": [320, 320],
+ "frames": [1, 4, 7, 10, 13, 16, 19, 22, 25, 28, 31, 34, 37, 40, 43, 46, 49, 52, 55, 58],
"_comment": "For some reason this needs to be 1:1"
},
{
@@ -156,7 +157,9 @@
{
"name": "baroque",
"size": "2x2",
- "kz": null
+ "kz": null,
+ "frames": { "start": 60, "end": 140 },
+ "resize": [320, 320]
},
{
"name": "humble",
@@ -200,7 +203,7 @@
"size": "4x4",
"kz": [8, 12],
"resize": [320, 320],
- "frames": [2805, 2826]
+ "frames": { "start": 2805, "end": 2826 }
},
{
"name": "unpacked",
@@ -265,7 +268,11 @@
{
"name": "backyard",
"size": "3x4",
- "kz": null
+ "kz": null,
+ "resize": [640, 640],
+ "frames": [3, 6, 12, 15, 18],
+ "animation": { "frametime": 3 },
+ "_comment": "For some reason this needs to be 1:1"
},
{
"name": "pond",
diff --git a/images/lowmist.png b/images/lowmist.png
new file mode 100644
index 0000000..5a69a54
--- /dev/null
+++ b/images/lowmist.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60b8aab6969b3bfd04f0448508062534070b8e046e9d23e859d73ef39dda3795
+size 852673
diff --git a/images/meditative.gif b/images/meditative.gif
new file mode 100644
index 0000000..5481f41
--- /dev/null
+++ b/images/meditative.gif
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7cd4507e5e9088661763b6d3ca252e01cebf67e0205500021575c87a6496fd0
+size 2256473
diff --git a/images/orb.png b/images/orb.png
new file mode 100644
index 0000000..f1e1f6c
--- /dev/null
+++ b/images/orb.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc71f56dc14f5ab85e71442f28c4b5f2b1b14e3d78d2c36060758ef68dc4ad96
+size 2208488
diff --git a/images/owlemons.png b/images/owlemons.png
new file mode 100644
index 0000000..d17fd22
--- /dev/null
+++ b/images/owlemons.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29527d980231e2a365c70377f6f4dbc83ace03d9dbd7129c1393444e5f460788
+size 3854226
diff --git a/images/passage.png b/images/passage.png
new file mode 100644
index 0000000..b789701
--- /dev/null
+++ b/images/passage.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2bca4c22bc8b3f923369f230d9dde0dcd888597c14041f33962566160970d73
+size 12063488
diff --git a/images/pond.png b/images/pond.png
new file mode 100644
index 0000000..775325e
--- /dev/null
+++ b/images/pond.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6e1a245be70521ea7637b89c99742fa6b9a888f74f076664151293fde26714f
+size 4168532
diff --git a/images/prairie_ride.png b/images/prairie_ride.png
new file mode 100644
index 0000000..9697b75
--- /dev/null
+++ b/images/prairie_ride.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac3b7c879a8ef1b74f8d9911afa660ae1fc978dbda566e830c774ebaaf0fe945
+size 420639
diff --git a/images/sunflowers.jpg b/images/sunflowers.jpg
new file mode 100644
index 0000000..586e494
--- /dev/null
+++ b/images/sunflowers.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4f6a5a9bc78913a455771d8ea08c193238e0c452014afd79b28a3c8e9b1f6d5
+size 1118458
diff --git a/images/test.json b/images/test.json
index 3873c03..a7268fd 100644
--- a/images/test.json
+++ b/images/test.json
@@ -1,22 +1,23 @@
{
"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]
+ "1x1": [320, 320],
+ "1x2": [320, 640],
+ "2x1": [640, 320],
+ "2x2": [640, 640],
+ "3x3": [960, 960],
+ "3x4": [960, 1280],
+ "4x2": [1280, 640],
+ "4x3": [1280, 960],
+ "4x4": [1280, 1280]
},
"images": [
{
- "name": "burning_skull",
- "size": "4x4",
- "kz": [8, 12],
- "resize": [620, 620],
- "frames": [2805, 2826]
+ "name": "graham",
+ "size": "1x2",
+ "kz": [1, 4],
+ "resize": [320, 320],
+ "frames": [1, 4, 7, 10, 13, 16, 19, 22, 25, 28, 31, 34, 37, 40, 43, 46, 49, 52, 55, 58],
+ "_comment": "For some reason this needs to be 1:1"
}
]
}
diff --git a/images/tides.png b/images/tides.png
new file mode 100644
index 0000000..da0b62f
--- /dev/null
+++ b/images/tides.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90fcb7d75d048b7e9afb36b6ddf2d02b4ce6b7a28b1cf95e9693bcc6e9615ad8
+size 4610045
diff --git a/images/unpacked.jpg b/images/unpacked.jpg
new file mode 100644
index 0000000..1d5ce3b
--- /dev/null
+++ b/images/unpacked.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7fb84c7c24dbd23249eeca0b515994d8e96300160e399ff7510d734f9a478a7
+size 309729
diff --git a/info.json b/info.json
index f73c04f..683e096 100644
--- a/info.json
+++ b/info.json
@@ -3,22 +3,23 @@
"description": "Replaces the ingame paintings with furry porn.",
"url": "https://git.furry.cool/MCFurryPacks/YiffyPaintings",
"versions": [
- ["1.06", 1],
- ["1.09", 2],
- ["1.11", 3],
- ["1.13", 4],
- ["1.14", 4],
- ["1.15", 5],
- ["1.16", 6],
- ["1.17", 7],
- ["1.18", 8],
- ["1.19", 9],
+ ["1.06", 1],
+ ["1.09", 2],
+ ["1.11", 3],
+ ["1.13", 4],
+ ["1.14", 4],
+ ["1.15", 5],
+ ["1.16", 6],
+ ["1.17", 7],
+ ["1.18", 8],
+ ["1.19", 9],
["1.19.3", 12],
["1.19.4", 13],
- ["1.20", 15],
+ ["1.20", 15],
["1.20.2", 18],
["1.20.3", 26],
- ["1.20.5", 32]
+ ["1.20.5", 32],
+ ["1.21", 34]
],
"exports": [],
"overrides": {
diff --git a/list.txt b/list.txt
new file mode 100644
index 0000000..c98c814
--- /dev/null
+++ b/list.txt
@@ -0,0 +1,67 @@
+1x1
+- kebab
+- aztec
+- alban
+- aztec2
+- bomb
+- plant
+- wasteland
+- meditative (1.21+)
+
+1x2
+- wanderer
+- graham
+- prairie_ride (1.21+)
+
+2x1
+- pool
+- courbet
+- sunset
+- sea
+- creebet
+
+2x2
+- match
+- bust
+- stage
+- void
+- skull_and_roses
+- wither
+- baroque (1.21+)
+- humble (1.21+)
+- earth (1.19+)
+- wind (1.19+)
+- fire (1.19+)
+- water (1.19+)
+
+3x3
+- bouquet (1.21+)
+- cavebird (1.21+)
+- cotan (1.21+)
+- endboss (1.21+)
+- fern (1.21+)
+- owlemons (1.21+)
+- sunflowers (1.21+)
+- tides (1.21+)
+
+3x4
+- backyard (1.21+)
+- pond (1.21+)
+
+4x2
+- fighters
+- changing (1.21+)
+- finding (1.21+)
+- lowmist (1.21+)
+- passage (1.21+)
+
+4x3
+- skeleton
+- donkey_kong
+
+4x4
+- pointer
+- pigscene
+- burning_skull
+- unpacked (1.21+)
+- orb (1.21+)
diff --git a/scripts/common.ts b/scripts/common.ts
index eccae93..44c93fc 100644
--- a/scripts/common.ts
+++ b/scripts/common.ts
@@ -8,7 +8,7 @@ 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) {
+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; } | number[], saveKz?: boolean) {
saveKz ??= false;
const originalWidth = width, originalHeight = height;
const originalFrameVH = Math.floor(Math.min(originalWidth, originalHeight) * framePercent);
@@ -37,11 +37,18 @@ export async function formatImage(name: string, image: string | string[], frameC
let files: string[] = [];
tmpDir = await mkdtemp(`${tmpdir()}/split-frames-`);
if (!Array.isArray(image)) {
- const [start = 0, end = null] = frames ?? [];
+ let select = "";
+ if (Array.isArray(frames)) {
+ select = frames.map(f => `eq(n\\,${f})`).join("+");
+ } else if (frames) {
+ select = `gte(n\\, ${frames.start})${frames.end ? `*lte(n\\,${frames.end}` : ""})`;
+ } else {
+ select = "n";
+ }
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})'` : ""}`)
+ .videoFilter(`scale=${inputWidth}:${inputHeight},select='${select}'`)
.addOption("-vsync vfr")
.output(`${tmpDir}/frame%04d.png`)
.on("end", async() => {
@@ -56,11 +63,12 @@ export async function formatImage(name: string, image: string | string[], frameC
console.log("Frames extracted to %s, %d total for %s", tmpDir, files.length, name);
resolve();
})
- .on("error", async() => {
+ .on("error", async(err) => {
if (tmpDir) {
await rm(tmpDir, { recursive: true });
}
console.error("Failed to extract frames for %s.", name);
+ console.error(err);
process.exit(1);
})
.run()
diff --git a/scripts/images.ts b/scripts/images.ts
index 79e9167..c7fb486 100755
--- a/scripts/images.ts
+++ b/scripts/images.ts
@@ -66,7 +66,7 @@ await mkdir(ap(kzOutDir), { recursive: true });
interface Image {
animation?: { frametime?: number; };
- frames?: [start: number, end: number];
+ frames?: { start: number; end?: number; } | number[];
kz: [x: number, y: number] | null;
name: string;
resize?: [width: number, height: number];