Fun things

CHANGELOG.md

@@ -1,4 +1,3 @@
-- Added `white` and `black` shark variants.
-- Added the `/blahaj wiki` client-side command to get a link to the wiki page.
-- Added a bunch of additional keywords for existing variants.
-- Fixed a few missing models in certain edge-cases.
+- Added `bread` plushie variant.
+- Added resource pack support for the cuddling animation.
+  - See the wiki for more details!

docs/keywords.md

@@ -16,6 +16,12 @@ Click on the plush to see a list of keywords you can use to get it.
             Whale
         </a>
     </div>
+    <div class="grid-item">
+        <a href="#bread">
+            <img src="../img/variants/bread.png">
+            Bread
+        </a>
+    </div>
     <div class="grid-item">
         <a href="#grey">
             <img src="../img/variants/grey.png">
@@ -275,6 +281,12 @@ Keywords: `shark`, `blahaj`, `blåhaj`, `shork`,
 
 Keywords: `whale`, `blavingad`, `blåvingad`
 
+## Bread
+
+![Bread](../img/variants/bread.png)
+
+Keywords: `bread`, `actual baguette`
+
 ## Grey
 
 ![Grey](../img/variants/grey.png)

gradle.properties

@@ -9,7 +9,7 @@ deps.yarn=1.21+build.1
 deps.fabricloader=0.15.11
 
 # Mod Properties
-mod_version=1.6.0
+mod_version=1.7.0
 maven_group=dev.enjarai.blahajtotem
 archives_base_name=blahaj-totem
 

mkdocs.yml

@@ -3,6 +3,7 @@ site_name: Blåhaj of Undying Wiki
 nav:
   - index.md
   - keywords.md
+  - resourcepacks.md
 
 theme:
   name: material

src/main/generated/.cache/ed966a455c4849743f9bad7f661ea201bfb98470

@@ -1,8 +1,8 @@
-// 1.21	2024-09-08T16:42:38.4315161	Blåhaj of Undying/Model Definitions
+// 1.21	2024-09-09T22:34:07.514492	Blåhaj of Undying/Model Definitions
 0328344f7ee0d0d51f6710182c2f66d9ab0e7f8e assets\blahaj_totem\models\item\blahaj_skins\demiboy_shark.json
 1cc7cdb3a189ebb3e5672fffda5973b9157cf3bf assets\blahaj_totem\models\item\blahaj_skins\trans_shark.json
 d4c40cb9fad911fa329d304d157868a6db6041b1 assets\blahaj_totem\models\item\blahaj_skins\demiromantic_shark.json
-a7922c6bb97cdb8d769ac55c3251d12398226675 assets\minecraft\models\item\totem_of_undying.json
+92aa2978f238f0442befaf912854a8c6ede85a00 assets\minecraft\models\item\totem_of_undying.json
 6480899a119dce40aa3ad47fb28bdc0d776fecc6 assets\blahaj_totem\models\item\blahaj_skins\magenta_shark.json
 42e40aaa4c4076f056e6f1d335893b1efe468a52 assets\blahaj_totem\models\item\blahaj_skins\whale_shark.json
 0fd89a6e0bc62435a37e72f7015b6a4972872914 assets\blahaj_totem\models\item\blahaj_skins\green_shark_large.json
@@ -35,8 +35,8 @@ ef8f00b3bd77564dde751881cdf1f36239f56f3e assets\blahaj_totem\models\item\blahaj_
 ee13643431aeb9e7a559a4e1857a97249bb46cd8 assets\blahaj_totem\models\item\blahaj_skins\agender_shark_large.json
 2f6e25eec5a1a93da2027ba32b428c48b7e06961 assets\blahaj_totem\models\item\blahaj_skins\genderqueer_shark_large.json
 17472c6473e6b9bc7407a973ec8fc0cdb9acaec8 assets\blahaj_totem\models\item\blahaj_skins\lime_shark.json
-7cd731b0d2e292069b3a7486a153bf40a1c46940 assets\blahaj_totem\models\item\blahaj_skins\prider_shark.json
 9b322f5b33aa5009bb0042604a7f37ea3bc6f932 assets\blahaj_totem\models\item\blahaj_skins\greyromantic_shark_large.json
+7cd731b0d2e292069b3a7486a153bf40a1c46940 assets\blahaj_totem\models\item\blahaj_skins\prider_shark.json
 39c4ac2e5aa2ac1952d8c7a3784dafd39abed01c assets\blahaj_totem\models\item\blahaj_skins\gay_shark.json
 19e7004880b6b8e45a2d1238f29032ec6eb7b23c assets\blahaj_totem\models\item\blahaj_skins\yellow_shark.json
 cc6510e0814568222bdf5e9db2a44bfee278ccf4 assets\blahaj_totem\models\item\blahaj_skins\grey_shark.json
@@ -45,13 +45,13 @@ a891207517bc974ef04404b74735b284e0061370 assets\blahaj_totem\models\item\blahaj_
 bee0c2a0450a2c5ce551ed4299f5ac417d723985 assets\blahaj_totem\models\item\blahaj_skins\grey_shark_large.json
 48d6c15b54b77e649748584d64d119768c4aef55 assets\blahaj_totem\models\item\blahaj_skins\mahiro_school_shark.json
 5b685cab9b59595cd9fc4b207c80951eedc77012 assets\blahaj_totem\models\item\blahaj_skins\aro_shark.json
-a996e38412a172c565e87ba334ccb51526a7d8a1 assets\blahaj_totem\models\item\blahaj_skins\poly_shark_large.json
 a2b7664f3c519ae310e808626f5d783a12e8fca3 assets\blahaj_totem\models\item\blahaj_skins\red_shark.json
+a996e38412a172c565e87ba334ccb51526a7d8a1 assets\blahaj_totem\models\item\blahaj_skins\poly_shark_large.json
 30e044408d9e6528cdceee706a2c700a1ccedcb7 assets\blahaj_totem\models\item\blahaj_skins\gay_shark_large.json
-c866f4e09912152360fdaf70e1048259e775c130 assets\blahaj_totem\models\item\blahaj_skins\aroace_shark.json
 5ac660f24961217093872c57c38c0037303fa713 assets\blahaj_totem\models\item\blahaj_skins\black_shark_large.json
-bf489d5e2929f52ad1dec25edefd1fdda7f955a7 assets\blahaj_totem\models\item\blahaj_skins\pink_shark.json
+c866f4e09912152360fdaf70e1048259e775c130 assets\blahaj_totem\models\item\blahaj_skins\aroace_shark.json
 ea76f00bbcdc7f32c6934fb82788d19826ab4cdf assets\blahaj_totem\models\item\blahaj_skins\greysexual_shark_large.json
+bf489d5e2929f52ad1dec25edefd1fdda7f955a7 assets\blahaj_totem\models\item\blahaj_skins\pink_shark.json
 a360a31013a318d5127807e735e4d765eb5d71a8 assets\blahaj_totem\models\item\blahaj_skins\lime_shark_large.json
 0f83dd3c22aec2932c2b8ba29f92bf2fe05b082b assets\blahaj_totem\models\item\blahaj_skins\demisexual_shark.json
 6a38447a725d2101c2ca9a01bb32397df87c2f72 assets\blahaj_totem\models\item\blahaj_skins\pride_shark_large.json
@@ -62,11 +62,12 @@ a8de69ca6c876689359cbed8b42a384a6f63c224 assets\blahaj_totem\models\item\blahaj_
 f21885eaf30c6df526562a1b8b250f4b95cb82d4 assets\blahaj_totem\models\item\blahaj_skins\red_shark_large.json
 192702d5390c09cb9af1390dca41fc0ea121958c assets\blahaj_totem\models\item\blahaj_skins\poly_shark.json
 af4f45a1596f87ccf8e95bec34a899be1e14e445 assets\blahaj_totem\models\item\blahaj_skins\aro_shark_large.json
+37a355f625f695028e4813a289e021801f961b13 assets\blahaj_totem\models\item\blahaj_skins\bread_shark_large.json
 efabfd6745bad86afffa209bbec813826aa9be89 assets\blahaj_totem\models\item\blahaj_skins\greysexual_shark.json
 27c1da7047a156711027b1f7c28fead021c93038 assets\blahaj_totem\models\item\blahaj_skins\astolfo_bean_shark.json
 6bf49c951ff85f28c01f29e37debc5adc4600765 assets\blahaj_totem\models\item\blahaj_skins\mahiro_school_shark_large.json
-39956599aad5a6d390c1d8f2e88e2608b90e651c assets\blahaj_totem\models\item\blahaj_skins\intersex_shark_large.json
 66c84faba233e260701c30dfcee8e48f1be16e5d assets\blahaj_totem\models\item\blahaj_skins\shark_shark.json
+39956599aad5a6d390c1d8f2e88e2608b90e651c assets\blahaj_totem\models\item\blahaj_skins\intersex_shark_large.json
 b079fbf97350d849937bd25c0569abe5f2db6938 assets\blahaj_totem\models\item\blahaj_skins\lesbian_shark.json
 7f3fc95f0bd0fec0f0b71a53201f4600214f9621 assets\blahaj_totem\models\item\blahaj_skins\bridget_shark_large.json
 59eab2906a02b39faadf9ff0a5dba4dd340f0713 assets\blahaj_totem\models\item\blahaj_skins\magenta_shark_large.json
@@ -75,9 +76,10 @@ d881583e251c11ae404ea68cb04daac63d94e5e0 assets\blahaj_totem\models\item\blahaj_
 7fbb6e60a2d80d39e804c05e269ade3d07ef0bb5 assets\blahaj_totem\models\item\blahaj_skins\bi_shark.json
 a637dee63154ec70699d93328b70fc5b470d3eb5 assets\blahaj_totem\models\item\blahaj_skins\intersex_shark.json
 220fbfe22304823c3d1f227067f0c24e5adf2264 assets\blahaj_totem\models\item\blahaj_skins\demigirl_shark_large.json
+966fe64ffd7f0a88d1b1610a2731bd8c310103d2 assets\blahaj_totem\models\item\blahaj_skins\bread_shark.json
 c28ac96c3368532907b375846d6fd6bd8efa8b96 assets\blahaj_totem\models\item\blahaj_skins\mahiro_lazy_shark_large.json
-b410eb01c2af6ff62c57521dfd949a89e22f2553 assets\blahaj_totem\models\item\blahaj_skins\trans_shark_large.json
 cd85b976ce552cbd02795313e6517d180a2aa67c assets\blahaj_totem\models\item\blahaj_skins\enby_shark.json
+b410eb01c2af6ff62c57521dfd949a89e22f2553 assets\blahaj_totem\models\item\blahaj_skins\trans_shark_large.json
 c6954c10495a6dfb5bc3e5c9c9e6346746db23e4 assets\blahaj_totem\models\item\blahaj_skins\demisexual_shark_large.json
 a16e76ea5da40575535b20f2d107d59af9301dfb assets\blahaj_totem\models\item\blahaj_skins\astolfo_bean_shark_large.json
 1c15666520d7cf271d0f71a9b4a0c159a04b93c4 assets\blahaj_totem\models\item\blahaj_skins\bridget_shark.json

src/main/generated/assets/blahaj_totem/models/item/blahaj_skins/bread_shark.json

@@ -0,0 +1,6 @@
+{
+  "parent": "blahaj_totem:item/bread",
+  "textures": {
+    "0": "blahaj_totem:item/blahaj_skins/bread_shark"
+  }
+}

src/main/generated/assets/blahaj_totem/models/item/blahaj_skins/bread_shark_large.json

@@ -0,0 +1,6 @@
+{
+  "parent": "blahaj_totem:item/bread_large",
+  "textures": {
+    "0": "blahaj_totem:item/blahaj_skins/bread_shark"
+  }
+}