:3

CHANGELOG.md

@@ -1,2 +1,4 @@
-- Fixed mistake in astolfo UVs.
-- Added a few more aliases for lazy mahiro.
+- 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.

docs/index.md

@@ -1,7 +1,7 @@
 # Home
 
 Welcome to the Blåhaj of Undying documentation. 
-This manual is currently up-to-date with version 1.5.1 of BoU. 
+This manual is currently up-to-date with version 1.6.0 of BoU. 
 Here you will find all the information you’ll need to enjoy Blåhaj of Undying to the fullest.
 
 Blåhaj of Undying is a very basic, yet adorable mod. When installed, 

docs/keywords.md

@@ -81,7 +81,19 @@ Click on the plush to see a list of keywords you can use to get it.
             <img src="../img/variants/pink.png">
             Pink
         </a>
-    </div>    
+    </div> 
+    <div class="grid-item">
+        <a href="#black">
+            <img src="../img/variants/black.png">
+            Black
+        </a>
+    </div>
+    <div class="grid-item">
+        <a href="#white">
+            <img src="../img/variants/white.png">
+            White
+        </a>
+    </div>
     <div class="grid-item">
         <a href="#ace">
             <img src="../img/variants/ace.png">
@@ -267,7 +279,7 @@ Keywords: `whale`, `blavingad`, `blåvingad`
 
 ![Grey](../img/variants/grey.png)
 
-Keywords: `gray`, `grey`
+Keywords: `gray`, `grey`, `grahaj`, `gråhaj`, `klappar haj`
 
 ## Red
 
@@ -327,7 +339,19 @@ Keywords: `magenta`
 
 ![Pink](../img/variants/pink.png)
 
-Keywords: `pink`
+Keywords: `pink`, `rosahaj`
+
+## Black
+
+![Black](../img/variants/black.png)
+
+Keywords: `black`
+
+## White
+
+![White](../img/variants/white.png)
+
+Keywords: `white`
 
 ## Ace
 
@@ -357,7 +381,7 @@ Keywords: `aroace`
 
 ![Bi](../img/variants/bi.png)
 
-Keywords: `bi`
+Keywords: `bi`, `bisexual`
 
 ## Demiboy
 
@@ -387,13 +411,13 @@ Keywords: `demisexual`
 
 ![Enby](../img/variants/enby.png)
 
-Keywords: `enby`
+Keywords: `enby`, `non binary`, `non-binary`
 
 ## Gay
 
 ![Gay](../img/variants/gay.png)
 
-Keywords: `gay`
+Keywords: `gay`, `homosexual`, `yaoi`
 
 ## Genderfluid
 
@@ -411,19 +435,19 @@ Keywords: `genderqueer`
 
 ![Greyromantic](../img/variants/greyromantic.png)
 
-Keywords: `greyromantic`
+Keywords: `greyromantic`, `grayromantic`
 
 ## Greyrose
 
 ![Greyrose](../img/variants/greyrose.png)
 
-Keywords: `greyrose`
+Keywords: `greyrose`, `grayrose`
 
 ## Greysexual
 
 ![Greysexual](../img/variants/greysexual.png)
 
-Keywords: `greysexual`
+Keywords: `greysexual`, `graysexual`
 
 ## Intersex
 
@@ -435,13 +459,13 @@ Keywords: `intersex`
 
 ![Lesbian](../img/variants/lesbian.png)
 
-Keywords: `lesbian`
+Keywords: `lesbian`, `yuri`
 
 ## Pan
 
 ![Pan](../img/variants/pan.png)
 
-Keywords: `pan`
+Keywords: `pan`, `pansexual`
 
 ## Poly
 
@@ -453,19 +477,19 @@ Keywords: `poly`
 
 ![Pride](../img/variants/pride.png)
 
-Keywords: `pride`
+Keywords: `pride`, `lgbt`
 
 ## Prider
 
 ![Prider](../img/variants/prider.png)
 
-Keywords: `prider`
+Keywords: `prider`, `lgbtqia`
 
 ## Trans
 
 ![Trans](../img/variants/trans.png)
 
-Keywords: `trans`
+Keywords: `trans`, `transgender`
 
 ## Bridget
 
@@ -491,4 +515,4 @@ Keywords: `mahiro`
 
 ![Lazy Mahiro](../img/variants/lazy-mahiro.png)
 
-Keywords: `lazy-mahiro`
+Keywords: `lazy mahiro`

gradle.properties

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

src/main/generated/.cache/ed966a455c4849743f9bad7f661ea201bfb98470

@@ -1,29 +1,30 @@
-// 1.21	2024-08-30T21:19:50.7927589	Blåhaj of Undying/Model Definitions
+// 1.21	2024-09-08T16:42:38.4315161	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
-d9243ece132b74ac527543215ec6378502b71cb1 assets\minecraft\models\item\totem_of_undying.json
+a7922c6bb97cdb8d769ac55c3251d12398226675 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
 3320dab9f7381073b86bc884982a0a51347ed292 assets\blahaj_totem\models\item\blahaj_skins\pan_shark.json
+3f669395b821d873aabae953673bcb0b670d680b assets\blahaj_totem\models\item\blahaj_skins\white_shark.json
 1e880d8e08646bc6dd9402c9c532e4070cf2ad3a assets\blahaj_totem\models\item\blahaj_skins\ace_shark_large.json
 9a0bc5c3673f19a3804911784f567979bf09b27e assets\blahaj_totem\models\item\blahaj_skins\genderfluid_shark.json
 59c03ba834a5fc72518f92c350a00368dbaa3f29 assets\blahaj_totem\models\item\blahaj_skins\greyromantic_shark.json
 5098d423f985d718bb6296bc5ba6abb6cb4314b4 assets\blahaj_totem\models\item\blahaj_skins\demigirl_shark.json
 8bdf3f95bf340bb35baf6c011dc5ce0315410318 assets\blahaj_totem\models\item\blahaj_skins\demiromantic_shark_large.json
 db7c91de2058f6652b36e7d47e679e3bfb79ebfe assets\blahaj_totem\models\item\blahaj_skins\pan_shark_large.json
 9e21b53bd3d59b73dba0e3b91a8a0ed0aecea18d assets\blahaj_totem\models\item\blahaj_skins\genderqueer_shark.json
+292ea4e2a8074d13158d6f56df7d1591b0ba135b assets\blahaj_totem\models\item\blahaj_skins\white_shark_large.json
 0d3982a621ff59b87021450c8d6e1b402ea6f97a assets\blahaj_totem\models\item\blahaj_skins\genderfluid_shark_large.json
 ffd66a20bc178b92924684ad486c3c14d08d52ad assets\blahaj_totem\models\item\blahaj_skins\purple_shark.json
 2dce09015e473185225c06c045c1f9bf45f02b1b assets\blahaj_totem\models\item\blahaj_skins\blue_shark.json
+f15680ccbdae6e57bf6a45fdc34807b66f0fd79d assets\blahaj_totem\models\item\blahaj_skins\black_shark.json
 f564802af436bff483b05de5a4f8bf5bdb689374 assets\blahaj_totem\models\item\blahaj_skins\pink_shark_large.json
-e0dcfaca57142af9f453f3566d8227873de64a21 assets\blahaj_totem\models\item\blahaj_skins\gray_shark_large.json
 b6679349c448918548026be7b921774924c9e198 assets\blahaj_totem\models\item\blahaj_skins\greyrose_shark.json
-bd73a35fa492e8360a02ad51170a43b472b3946b assets\blahaj_totem\models\item\blahaj_skins\yellow_shark_large.json
 6c2b8e30abeccb95d8c9dcc999fc87a8b28fde3f assets\blahaj_totem\models\item\blahaj_skins\orange_shark_large.json
+bd73a35fa492e8360a02ad51170a43b472b3946b assets\blahaj_totem\models\item\blahaj_skins\yellow_shark_large.json
 4389e57c0d0509d4c3b980148dcd2bf18197e4fe assets\blahaj_totem\models\item\blahaj_skins\prider_shark_large.json
-e76b8688aa33256ad87341f9cdebb5a91f7a5809 assets\blahaj_totem\models\item\blahaj_skins\gray_shark.json
 ef8f00b3bd77564dde751881cdf1f36239f56f3e assets\blahaj_totem\models\item\blahaj_skins\demiboy_shark_large.json
 00ba20314d1e64439b4a05899905e9cbc9504db4 assets\blahaj_totem\models\item\blahaj_skins\cyan_shark_large.json
 1515e6d194f2323e80993bbd3421ed0dcacde661 assets\blahaj_totem\models\item\blahaj_skins\aroace_shark_large.json
@@ -34,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
-9b322f5b33aa5009bb0042604a7f37ea3bc6f932 assets\blahaj_totem\models\item\blahaj_skins\greyromantic_shark_large.json
 7cd731b0d2e292069b3a7486a153bf40a1c46940 assets\blahaj_totem\models\item\blahaj_skins\prider_shark.json
+9b322f5b33aa5009bb0042604a7f37ea3bc6f932 assets\blahaj_totem\models\item\blahaj_skins\greyromantic_shark_large.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
@@ -48,6 +49,7 @@ a996e38412a172c565e87ba334ccb51526a7d8a1 assets\blahaj_totem\models\item\blahaj_
 a2b7664f3c519ae310e808626f5d783a12e8fca3 assets\blahaj_totem\models\item\blahaj_skins\red_shark.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
 ea76f00bbcdc7f32c6934fb82788d19826ab4cdf assets\blahaj_totem\models\item\blahaj_skins\greysexual_shark_large.json
 a360a31013a318d5127807e735e4d765eb5d71a8 assets\blahaj_totem\models\item\blahaj_skins\lime_shark_large.json
@@ -63,8 +65,8 @@ af4f45a1596f87ccf8e95bec34a899be1e14e445 assets\blahaj_totem\models\item\blahaj_
 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
-66c84faba233e260701c30dfcee8e48f1be16e5d assets\blahaj_totem\models\item\blahaj_skins\shark_shark.json
 39956599aad5a6d390c1d8f2e88e2608b90e651c assets\blahaj_totem\models\item\blahaj_skins\intersex_shark_large.json
+66c84faba233e260701c30dfcee8e48f1be16e5d assets\blahaj_totem\models\item\blahaj_skins\shark_shark.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
@@ -73,12 +75,12 @@ 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
-cd85b976ce552cbd02795313e6517d180a2aa67c assets\blahaj_totem\models\item\blahaj_skins\enby_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
 c6954c10495a6dfb5bc3e5c9c9e6346746db23e4 assets\blahaj_totem\models\item\blahaj_skins\demisexual_shark_large.json
-c28ac96c3368532907b375846d6fd6bd8efa8b96 assets\blahaj_totem\models\item\blahaj_skins\mahiro_lazy_shark_large.json
-1c15666520d7cf271d0f71a9b4a0c159a04b93c4 assets\blahaj_totem\models\item\blahaj_skins\bridget_shark.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
 21c95a5db137af6d8aa09efff71e623f7df1c291 assets\blahaj_totem\models\item\blahaj_skins\purple_shark_large.json
 ccb66a549685eb4d820d2ba73d60777b2d0628b9 assets\blahaj_totem\models\item\blahaj_skins\bi_shark_large.json
 cab45fdba4d275896befed6ca1fc89a684ee7114 assets\blahaj_totem\models\item\blahaj_skins\shark_shark_large.json

src/main/generated/assets/blahaj_totem/models/item/blahaj_skins/gray_shark.json → src/main/generated/assets/blahaj_totem/models/item/blahaj_skins/black_shark.json

@@ -1,6 +1,6 @@
 {
   "parent": "blahaj_totem:item/shork",
   "textures": {
-    "0": "blahaj_totem:item/blahaj_skins/gray_shark"
+    "0": "blahaj_totem:item/blahaj_skins/black_shark"
   }
 }

src/main/generated/assets/blahaj_totem/models/item/blahaj_skins/gray_shark_large.json → src/main/generated/assets/blahaj_totem/models/item/blahaj_skins/black_shark_large.json

@@ -1,6 +1,6 @@
 {
   "parent": "blahaj_totem:item/shork_large",
   "textures": {
-    "0": "blahaj_totem:item/blahaj_skins/gray_shark"
+    "0": "blahaj_totem:item/blahaj_skins/black_shark"
   }
 }

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

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

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

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