Publish teim :D

CHANGELOG.md

@@ -1,3 +1,2 @@
-- Added `whale` shark variant, turning your shark into our also beloved Blåvingad.
-- Added `prider` shark texture, similar to the `pride` shark, but with just a tad more representation.
-- Tweaked `trans` shark texture to be more in line with other pride textures.
+- Added the option to not have Totems be Blåhaj by default as a builtin resource pack.
+- Fixed a mistake in the updated `trans` shark texture.

build.gradle

@@ -2,6 +2,7 @@ plugins {
 	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 	id "me.modmuss50.mod-publish-plugin" version "0.4.4"
+	id 'me.fallenbreath.yamlang' version '1.3.1'
 }
 
 version = project.mod_version
@@ -81,6 +82,11 @@ loom {
 	}
 }
 
+yamlang {
+	targetSourceSets = [sourceSets.main]
+	inputDir = "assets/blahaj_totem/lang"
+}
+
 // configure the maven publication
 publishing {
 	publications {

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings=1.20.6+build.1
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=1.4.0
+mod_version=1.4.1
 maven_group=dev.enjarai.blahajtotem
 archives_base_name=blahaj-totem
 

src/main/generated/.cache/ed966a455c4849743f9bad7f661ea201bfb98470

@@ -1,8 +1,8 @@
-// 1.20.6	2024-05-29T15:02:22.831031	Blåhaj of Undying/Model Definitions
+// 1.20.6	2024-05-29T20:05:30.6926358	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
-1a043225708ea5537309702ab3bd88b9237a260c assets\minecraft\models\item\totem_of_undying.json
+9cf0d07ded165bf4716cdd59415bbd0702dd118f 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
 3320dab9f7381073b86bc884982a0a51347ed292 assets\blahaj_totem\models\item\blahaj_skins\pan_shark.json
@@ -17,6 +17,7 @@ bf489d5e2929f52ad1dec25edefd1fdda7f955a7 assets\blahaj_totem\models\item\blahaj_
 a8de69ca6c876689359cbed8b42a384a6f63c224 assets\blahaj_totem\models\item\blahaj_skins\green_shark.json
 192702d5390c09cb9af1390dca41fc0ea121958c assets\blahaj_totem\models\item\blahaj_skins\poly_shark.json
 efabfd6745bad86afffa209bbec813826aa9be89 assets\blahaj_totem\models\item\blahaj_skins\greysexual_shark.json
+66c84faba233e260701c30dfcee8e48f1be16e5d assets\blahaj_totem\models\item\blahaj_skins\shark_shark.json
 9e21b53bd3d59b73dba0e3b91a8a0ed0aecea18d assets\blahaj_totem\models\item\blahaj_skins\genderqueer_shark.json
 ffd66a20bc178b92924684ad486c3c14d08d52ad assets\blahaj_totem\models\item\blahaj_skins\purple_shark.json
 b079fbf97350d849937bd25c0569abe5f2db6938 assets\blahaj_totem\models\item\blahaj_skins\lesbian_shark.json

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

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

src/main/generated/assets/minecraft/models/item/totem_of_undying.json

@@ -1,218 +1,224 @@
 {
-  "parent": "blahaj_totem:item/shork",
+  "parent": "blahaj_totem:item/totem_parent",
   "overrides": [
     {
       "model": "blahaj_totem:item/blahaj_skins/gray_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.027777778
+        "blahaj_totem:shork_variant": 0.027027028
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/grey_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.055555556
+        "blahaj_totem:shork_variant": 0.054054055
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/red_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.083333336
+        "blahaj_totem:shork_variant": 0.08108108
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/orange_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.11111111
+        "blahaj_totem:shork_variant": 0.10810811
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/yellow_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.1388889
+        "blahaj_totem:shork_variant": 0.13513513
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/lime_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.16666667
+        "blahaj_totem:shork_variant": 0.16216215
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/green_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.19444445
+        "blahaj_totem:shork_variant": 0.1891892
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/cyan_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.22222222
+        "blahaj_totem:shork_variant": 0.21621622
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/blue_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.25
+        "blahaj_totem:shork_variant": 0.24324325
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/purple_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.2777778
+        "blahaj_totem:shork_variant": 0.27027026
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/magenta_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.30555555
+        "blahaj_totem:shork_variant": 0.2972973
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/pink_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.33333334
+        "blahaj_totem:shork_variant": 0.3243243
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/ace_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.3611111
+        "blahaj_totem:shork_variant": 0.35135135
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/agender_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.3888889
+        "blahaj_totem:shork_variant": 0.3783784
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/aro_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.41666666
+        "blahaj_totem:shork_variant": 0.4054054
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/aroace_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.44444445
+        "blahaj_totem:shork_variant": 0.43243244
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/bi_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.4722222
+        "blahaj_totem:shork_variant": 0.45945945
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/demiboy_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.5
+        "blahaj_totem:shork_variant": 0.4864865
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/demigirl_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.5277778
+        "blahaj_totem:shork_variant": 0.5135135
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/demiromantic_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.5555556
+        "blahaj_totem:shork_variant": 0.5405405
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/demisexual_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.5833333
+        "blahaj_totem:shork_variant": 0.5675676
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/enby_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.6111111
+        "blahaj_totem:shork_variant": 0.5945946
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/gay_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.6388889
+        "blahaj_totem:shork_variant": 0.6216216
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/genderfluid_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.6666667
+        "blahaj_totem:shork_variant": 0.6486486
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/genderqueer_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.6944444
+        "blahaj_totem:shork_variant": 0.6756757
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/greyromantic_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.7222222
+        "blahaj_totem:shork_variant": 0.7027027
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/greyrose_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.75
+        "blahaj_totem:shork_variant": 0.7297297
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/greysexual_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.7777778
+        "blahaj_totem:shork_variant": 0.7567568
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/intersex_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.8055556
+        "blahaj_totem:shork_variant": 0.7837838
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/lesbian_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.8333333
+        "blahaj_totem:shork_variant": 0.8108108
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/pan_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.8611111
+        "blahaj_totem:shork_variant": 0.8378378
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/poly_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.8888889
+        "blahaj_totem:shork_variant": 0.8648649
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/pride_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.9166667
+        "blahaj_totem:shork_variant": 0.8918919
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/prider_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.9444444
+        "blahaj_totem:shork_variant": 0.9189189
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/trans_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.9722222
+        "blahaj_totem:shork_variant": 0.9459459
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/whale_shark",
+      "predicate": {
+        "blahaj_totem:shork_variant": 0.972973
+      }
+    },
+    {
+      "model": "blahaj_totem:item/blahaj_skins/shark_shark",
       "predicate": {
         "blahaj_totem:shork_variant": 1.0
       }

src/main/java/dev/enjarai/blahajtotem/BlahajFlags.java

@@ -0,0 +1,29 @@
+package dev.enjarai.blahajtotem;
+
+import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;
+import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.util.Identifier;
+
+public class BlahajFlags implements IdentifiableResourceReloadListener, SimpleSynchronousResourceReloadListener {
+    public static boolean defaultToTotem = false;
+
+    public static boolean isBlahaj(ItemStack itemStack) {
+        if (itemStack.isOf(Items.TOTEM_OF_UNDYING)) {
+            return !BlahajFlags.defaultToTotem || BlahajTotem.getShorkType(itemStack) != null;
+        }
+        return false;
+    }
+
+    @Override
+    public Identifier getFabricId() {
+        return BlahajTotem.id("flags");
+    }
+
+    @Override
+    public void reload(ResourceManager manager) {
+        defaultToTotem = manager.getResource(BlahajTotem.id("default_to_totem")).isPresent();
+    }
+}