So this work?

enjarai · May 29, 2024 · 7c55fdf · 7c55fdf
1 parent 7bd37b8
commit 7c55fdf
Show file tree

Hide file tree

Showing 15 changed files with 260 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1 +1,3 @@
-- Updated to 1.20.6.
+- 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.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,7 @@
 plugins {
 	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
+	id "me.modmuss50.mod-publish-plugin" version "0.4.4"
 }
 
 version = project.mod_version
@@ -95,4 +96,46 @@ publishing {
 		// The repositories here will be used for publishing your artifact, not for
 		// retrieving dependencies.
 	}
+}
+
+publishMods {
+	file = remapJar.archiveFile
+	displayName = "${property('mod_version')} for ${property('minecraft_version')}"
+	version = project.version
+	changelog = getRootProject().file("CHANGELOG.md").text
+	type = STABLE
+	modLoaders.add("fabric")
+
+	def min = property('publish_target_min')
+	def max = property('publish_target_max')
+
+	if (providers.gradleProperty('enjaraiModrinthToken').present) {
+		modrinth {
+			projectId = property('mod_modrinth')
+			accessToken = providers.gradleProperty('enjaraiModrinthToken').get()
+
+			if (min == max) {
+				minecraftVersions.add(min)
+			} else {
+				minecraftVersionRange {
+					start = min
+					end = max
+				}
+			}
+
+			requires {
+				slug = "fabric-api"
+			}
+		}
+	}
+
+	if (providers.gradleProperty('enjaraiGithubToken').present) {
+		github {
+			repository = property('mod_github')
+			accessToken = providers.gradleProperty('enjaraiGithubToken').get()
+
+			commitish = property('git_branch')
+			tagName = project.version
+		}
+	}
 }
diff --git a/gradle.properties b/gradle.properties
@@ -9,9 +9,15 @@ yarn_mappings=1.20.6+build.1
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=1.3.1
+mod_version=1.4.0
 maven_group=dev.enjarai.blahajtotem
 archives_base_name=blahaj-totem
 
+publish_target_min=1.20.5
+publish_target_max=1.20.6
+mod_modrinth=aJb4vlkM
+mod_github=enjarai/blahaj-of-undying
+git_branch=master
+
 # Dependencies
 fabric_version=0.98.0+1.20.6
diff --git a/src/main/generated/.cache/ed966a455c4849743f9bad7f661ea201bfb98470 b/src/main/generated/.cache/ed966a455c4849743f9bad7f661ea201bfb98470
@@ -1,9 +1,10 @@
-// 1.20.1	2024-04-05T21:39:24.2305186	Blåhaj of Undying/Model Definitions
+// 1.20.6	2024-05-29T15:02:22.831031	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
-857b1d567aca141fce7cb5900a83e5d668f61797 assets\minecraft\models\item\totem_of_undying.json
+1a043225708ea5537309702ab3bd88b9237a260c 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
 5b685cab9b59595cd9fc4b207c80951eedc77012 assets\blahaj_totem\models\item\blahaj_skins\aro_shark.json
 a2b7664f3c519ae310e808626f5d783a12e8fca3 assets\blahaj_totem\models\item\blahaj_skins\red_shark.json
@@ -31,6 +32,7 @@ d881583e251c11ae404ea68cb04daac63d94e5e0 assets\blahaj_totem\models\item\blahaj_
 a637dee63154ec70699d93328b70fc5b470d3eb5 assets\blahaj_totem\models\item\blahaj_skins\intersex_shark.json
 cd85b976ce552cbd02795313e6517d180a2aa67c assets\blahaj_totem\models\item\blahaj_skins\enby_shark.json
 17472c6473e6b9bc7407a973ec8fc0cdb9acaec8 assets\blahaj_totem\models\item\blahaj_skins\lime_shark.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
diff --git a/src/main/generated/assets/blahaj_totem/models/item/blahaj_skins/prider_shark.json b/src/main/generated/assets/blahaj_totem/models/item/blahaj_skins/prider_shark.json
@@ -0,0 +1,6 @@
+{
+  "parent": "blahaj_totem:item/shork",
+  "textures": {
+    "0": "blahaj_totem:item/blahaj_skins/prider_shark"
+  }
+}
diff --git a/src/main/generated/assets/blahaj_totem/models/item/blahaj_skins/whale_shark.json b/src/main/generated/assets/blahaj_totem/models/item/blahaj_skins/whale_shark.json
@@ -0,0 +1,6 @@
+{
+  "parent": "blahaj_totem:item/whal",
+  "textures": {
+    "0": "blahaj_totem:item/blahaj_skins/whale_shark"
+  }
+}
diff --git a/src/main/generated/assets/minecraft/models/item/totem_of_undying.json b/src/main/generated/assets/minecraft/models/item/totem_of_undying.json
@@ -4,203 +4,215 @@
     {
       "model": "blahaj_totem:item/blahaj_skins/gray_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.029411765
+        "blahaj_totem:shork_variant": 0.027777778
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/grey_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.05882353
+        "blahaj_totem:shork_variant": 0.055555556
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/red_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.0882353
+        "blahaj_totem:shork_variant": 0.083333336
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/orange_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.11764706
+        "blahaj_totem:shork_variant": 0.11111111
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/yellow_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.14705883
+        "blahaj_totem:shork_variant": 0.1388889
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/lime_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.1764706
+        "blahaj_totem:shork_variant": 0.16666667
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/green_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.20588236
+        "blahaj_totem:shork_variant": 0.19444445
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/cyan_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.23529412
+        "blahaj_totem:shork_variant": 0.22222222
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/blue_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.2647059
+        "blahaj_totem:shork_variant": 0.25
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/purple_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.29411766
+        "blahaj_totem:shork_variant": 0.2777778
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/magenta_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.32352942
+        "blahaj_totem:shork_variant": 0.30555555
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/pink_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.3529412
+        "blahaj_totem:shork_variant": 0.33333334
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/ace_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.38235295
+        "blahaj_totem:shork_variant": 0.3611111
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/agender_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.4117647
+        "blahaj_totem:shork_variant": 0.3888889
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/aro_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.44117647
+        "blahaj_totem:shork_variant": 0.41666666
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/aroace_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.47058824
+        "blahaj_totem:shork_variant": 0.44444445
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/bi_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.5
+        "blahaj_totem:shork_variant": 0.4722222
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/demiboy_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.5294118
+        "blahaj_totem:shork_variant": 0.5
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/demigirl_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.5588235
+        "blahaj_totem:shork_variant": 0.5277778
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/demiromantic_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.5882353
+        "blahaj_totem:shork_variant": 0.5555556
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/demisexual_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.61764705
+        "blahaj_totem:shork_variant": 0.5833333
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/enby_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.64705884
+        "blahaj_totem:shork_variant": 0.6111111
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/gay_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.6764706
+        "blahaj_totem:shork_variant": 0.6388889
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/genderfluid_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.7058824
+        "blahaj_totem:shork_variant": 0.6666667
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/genderqueer_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.7352941
+        "blahaj_totem:shork_variant": 0.6944444
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/greyromantic_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.7647059
+        "blahaj_totem:shork_variant": 0.7222222
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/greyrose_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.7941176
+        "blahaj_totem:shork_variant": 0.75
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/greysexual_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.8235294
+        "blahaj_totem:shork_variant": 0.7777778
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/intersex_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.85294116
+        "blahaj_totem:shork_variant": 0.8055556
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/lesbian_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.88235295
+        "blahaj_totem:shork_variant": 0.8333333
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/pan_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.9117647
+        "blahaj_totem:shork_variant": 0.8611111
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/poly_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.9411765
+        "blahaj_totem:shork_variant": 0.8888889
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/pride_shark",
       "predicate": {
-        "blahaj_totem:shork_variant": 0.9705882
+        "blahaj_totem:shork_variant": 0.9166667
+      }
+    },
+    {
+      "model": "blahaj_totem:item/blahaj_skins/prider_shark",
+      "predicate": {
+        "blahaj_totem:shork_variant": 0.9444444
       }
     },
     {
       "model": "blahaj_totem:item/blahaj_skins/trans_shark",
+      "predicate": {
+        "blahaj_totem:shork_variant": 0.9722222
+      }
+    },
+    {
+      "model": "blahaj_totem:item/blahaj_skins/whale_shark",
       "predicate": {
         "blahaj_totem:shork_variant": 1.0
       }

diff --git a/src/main/java/dev/enjarai/blahajtotem/BlahajTotem.java b/src/main/java/dev/enjarai/blahajtotem/BlahajTotem.java
@@ -54,7 +54,10 @@ public class BlahajTotem implements ClientModInitializer, DataGeneratorEntrypoin
             new BlahajType("pan", 0xf2ce7d, 0xd668b9, 0x6595b0),
             new BlahajType("poly", 0xe34160, 0x6d9ff8, 0x2f2545, 0xffae3b),
             new BlahajType("pride", 0xde585b, 0xf07f5d, 0xe4bd5c, 0x96df5e, 0x6261a1, 0x704c9e),
-            new BlahajType("trans", 0x6f9fba, 0xe882b6, 0xc6d3d6)
+            new BlahajType("prider", 0xde585b, 0xf07f5d, 0xe4bd5c, 0x96df5e, 0x6261a1, 0x704c9e, 0x6f9fba, 0xe882b6, 0xc6d3d6),
+            new BlahajType("trans", 0x6f9fba, 0xe882b6, 0xc6d3d6),
+
+            new BlahajType("whale", BlahajTotem.id("item/whal"), 0x39508e, 0x546bb3, 0xc3d0d3)
     );
 
     @Override

diff --git a/src/main/java/dev/enjarai/blahajtotem/BlahajType.java b/src/main/java/dev/enjarai/blahajtotem/BlahajType.java
@@ -1,4 +1,9 @@
 package dev.enjarai.blahajtotem;
 
-public record BlahajType(String name, int... colors) {
+import net.minecraft.util.Identifier;
+
+public record BlahajType(String name, Identifier model, int... colors) {
+    public BlahajType(String name, int... colors) {
+        this(name, BlahajTotem.id("item/shork"), colors);
+    }
 }
diff --git a/src/main/java/dev/enjarai/blahajtotem/ShorkModelGenerator.java b/src/main/java/dev/enjarai/blahajtotem/ShorkModelGenerator.java
@@ -47,7 +47,7 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) {
         BlahajTotem.VARIANTS.forEach(variant -> {
             itemModelGenerator.writer.accept(BlahajTotem.id("item/blahaj_skins/" + variant.name() + "_shark"), () -> {
                 var model = new JsonObject();
-                model.addProperty("parent", BlahajTotem.id("item/shork").toString());
+                model.addProperty("parent", variant.model().toString());
 
                 var textures = new JsonObject();
                 textures.addProperty("0", BlahajTotem.id("item/blahaj_skins/" + variant.name() + "_shark").toString());