Addition of new Pride Sharks!

src/main/java/org/prismlauncher/blahaj/Common.java

@@ -31,6 +31,72 @@ public void onInitialize() {
 		Item blueShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.blue_shark.tooltip");
 		Registry.register(BuiltInRegistries.ITEM, asResource("blue_shark"), blueShark);
 
+		Item prideShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.pride_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("pride_shark"), prideShark);
+
+		Item transShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.trans_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("trans_shark"), transShark);
+
+		Item enbyShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.enby_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("enby_shark"), enbyShark);
+
+		Item lesbianShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.lesbian_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("lesbian_shark"), lesbianShark);
+
+		Item panShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.pan_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("pan_shark"), panShark);
+
+		Item aroaceShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.aroace_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("aroace_shark"), aroaceShark);
+
+		Item genderqueerShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.genderqueer_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("genderqueer_shark"), genderqueerShark);
+
+		Item genderfluidShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.genderfluid_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("genderfluid_shark"), genderfluidShark);
+
+		Item aroShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.aro_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("aro_shark"), aroShark);
+
+		Item aceShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.ace_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("ace_shark"), aceShark);
+
+		Item demisexualShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.demisexual_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("demisexual_shark"), demisexualShark);
+
+		Item demiboyShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.demiboy_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("demiboy_shark"), demiboyShark);
+
+		Item demigirlShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.demigirl_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("demigirl_shark"), demigirlShark);
+
+		Item demiromanticShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.demiromantic_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("demiromantic_shark"), demiromanticShark);
+
+		Item biShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.bi_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("bi_shark"), biShark);
+
+		Item gayShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.gay_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("gay_shark"), gayShark);
+
+		Item polyShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.poly_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("poly_shark"), polyShark);
+
+		Item greyroseShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.greyrose_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("greyrose_shark"), greyroseShark);
+
+		Item greysexualShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.greysexual_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("greysexual_shark"), greysexualShark);
+
+		Item greyromanticShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.greyromantic_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("greyromantic_shark"), greyromanticShark);
+
+		Item agenderShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.agender_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("agender_shark"), agenderShark);
+
+		Item intersexShark = new CuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.intersex_shark.tooltip");
+		Registry.register(BuiltInRegistries.ITEM, asResource("intersex_shark"), intersexShark);
+
 		Item blueWhale = new ItemContainerCuddlyItem(new Item.Properties().stacksTo(1), "item.blahaj.blue_whale.tooltip");
 		Registry.register(BuiltInRegistries.ITEM, asResource("blue_whale"), blueWhale);
 
@@ -41,8 +107,30 @@ public void onInitialize() {
 		ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((content) -> {
 			content.accept(blueShark);
 			content.accept(grayShark);
+			content.accept(prideShark);
+			content.accept(transShark);
+			content.accept(enbyShark);
+			content.accept(lesbianShark);
+			content.accept(aroaceShark);
+			content.accept(panShark);
 			content.accept(blueWhale);
 			content.accept(breadPillow);
+			content.accept(genderqueerShark);
+			content.accept(genderfluidShark);
+			content.accept(aroShark);
+			content.accept(aceShark);
+			content.accept(demisexualShark);
+			content.accept(demiromanticShark);
+			content.accept(demigirlShark);
+			content.accept(demiboyShark);
+			content.accept(biShark);
+			content.accept(gayShark);
+		    content.accept(polyShark);
+			content.accept(greyroseShark);
+			content.accept(greysexualShark);
+			content.accept(greyromanticShark);
+			content.accept(agenderShark);
+			content.accept(intersexShark);
 		});
 
 		LootTableEvents.MODIFY.register((resourceManager, lootManager, id, tableBuilder, source) -> {

src/main/resources/assets/blahaj/lang/en_us.json

@@ -3,6 +3,50 @@
 	"item.blahaj.blue_shark.tooltip": "a.k.a. Blahaj",
 	"item.blahaj.gray_shark": "Gray Toy Shark",
 	"item.blahaj.gray_shark.tooltip": "a.k.a. Klappar Haj",
+	"item.blahaj.pride_shark": "Prideful Toy Shark",
+	"item.blahaj.pride_shark.tooltip": "a.k.a. Pridehaj",
+	"item.blahaj.trans_shark": "Trans Toy Shark",
+	"item.blahaj.trans_shark.tooltip": "a.k.a. BeYou Blahaj",
+	"item.blahaj.enby_shark": "Non-binary Toy Shark",
+	"item.blahaj.enby_shark.tooltip": "a.k.a. Enbyhaj",
+	"item.blahaj.lesbian_shark": "Lesbian Toy Shark",
+	"item.blahaj.lesbian_shark.tooltip": "a.k.a. Girlkisser Blahaj",
+	"item.blahaj.pan_shark": "Pan Toy Shark",
+	"item.blahaj.pan_shark.tooltip": "It likes all the colors of the sea!",
+	"item.blahaj.aroace_shark": "Aroace Toy Shark",
+	"item.blahaj.aroace_shark.tooltip": "a.k.a. Aroace Blahaj",
+	"item.blahaj.aro_shark": "Aromantic Toy Shark",
+	"item.blahaj.aro_shark.tooltip": "a.k.a. Arohaj",
+	"item.blahaj.bi_shark": "Bi Toy Shark",
+	"item.blahaj.bi_shark.tooltip": "a.k.a. Bihaj",
+	"item.blahaj.demisexual_shark": "Demisexual Toy Shark",
+	"item.blahaj.demisexual_shark.tooltip": "a.k.a. Demisexual Blahaj",
+	"item.blahaj.demiboy_shark": "Demiboy Toy Shark",
+	"item.blahaj.demiboy_shark.tooltip": "a.k.a. Demiboy Blahaj",
+	"item.blahaj.demigirl_shark": "Demigirl Toy Shark",
+	"item.blahaj.demigirl_shark.tooltip": "a.k.a. Demigirl Blahaj",
+	"item.blahaj.demiromantic_shark": "Demiromantic Toy Shark",
+	"item.blahaj.demiromantic_shark.tooltip": "a.k.a. Demiromantic Blahaj",
+	"item.blahaj.gay_shark": "Gay Toy Shark",
+	"item.blahaj.gay_shark.tooltip": "a.k.a. Gayhaj",
+	"item.blahaj.genderqueer_shark": "Genderqueer Toy Shark",
+	"item.blahaj.genderqueer_shark.tooltip": "a.k.a. Queerhaj",
+	"item.blahaj.genderfluid_shark": "Genderfluid Toy Shark",
+	"item.blahaj.genderfluid_shark.tooltip": "a.k.a. Fluidhaj",
+	"item.blahaj.ace_shark": "Ace Toy Shark",
+	"item.blahaj.ace_shark.tooltip": "a.k.a. Acehaj",
+    "item.blahaj.poly_shark": "Poly Toy Shark",
+    "item.blahaj.poly_shark.tooltip": "a.k.a. Polyhaj",
+    "item.blahaj.greyrose_shark": "Greyrose Toy Shark",
+    "item.blahaj.greyrose_shark.tooltip": "a.k.a. Greyrosehaj",
+    "item.blahaj.greysexual_shark": "Greysexual Toy Shark",
+    "item.blahaj.greysexual_shark.tooltip": "a.k.a. Greysexualhaj",
+    "item.blahaj.greyromantic_shark": "Greyromantic Toy Shark",
+    "item.blahaj.greyromantic_shark.tooltip": "a.k.a. Greyromantichaj",
+    "item.blahaj.agender_shark": "Agender Toy Shark",
+    "item.blahaj.agender_shark.tooltip": "a.k.a. Agenderhaj",
+    "item.blahaj.intersex_shark": "Intersex Toy Shark",
+    "item.blahaj.intersex_shark.tooltip": "a.k.a. Intersexhaj",
 	"item.blahaj.blue_whale": "Soft Toy Blue Whale",
 	"item.blahaj.blue_whale.tooltip": "a.k.a. Blavingad. Holds a stack of items.",
 	"item.blahaj.bread": "Bread Pillow",

src/main/resources/assets/blahaj/models/item/ace_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/ace_shork"
+	}
+}

src/main/resources/assets/blahaj/models/item/agender_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/agender_shork"
+	}
+}

src/main/resources/assets/blahaj/models/item/aro_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/aro_shork"
+	}
+}

src/main/resources/assets/blahaj/models/item/aroace_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/aroace_shork"
+	}
+}

src/main/resources/assets/blahaj/models/item/bi_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/bi_shork"
+	}
+}

src/main/resources/assets/blahaj/models/item/blue_shark.json

@@ -1,5 +1,6 @@
 {
 	"texture_size": [32, 32],
+	"credit": "original model by hibii, changes made by musicalskele",
 	"textures": {
 		"0": "blahaj:item/shork",
 		"particle": "#0"
@@ -49,7 +50,7 @@
 			"name": "tail stabilizer",
 			"from": [7.5, 8, 14],
 			"to": [8.5, 12, 16],
-			"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 9, 15]},
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 9, 14]},
 			"faces": {
 				"north": {"uv": [1, 1, 1.5, 3], "texture": "#0"},
 				"east": {"uv": [0, 1, 1, 3], "texture": "#0"},
@@ -59,6 +60,48 @@
 				"down": {"uv": [2, 0, 1.5, 1], "texture": "#0"}
 			}
 		},
+		{
+			"name": "tail stabilizer",
+			"from": [7.5, 6, 13],
+			"to": [8.5, 9, 15],
+			"rotation": {"angle": -45, "axis": "x", "origin": [8, 9, 15]},
+			"faces": {
+				"north": {"uv": [1.5, 8, 2, 9.5], "texture": "#0"},
+				"east": {"uv": [0.5, 8, 1.5, 9.5], "texture": "#0"},
+				"south": {"uv": [3, 8, 3.5, 9.5], "texture": "#0"},
+				"west": {"uv": [2, 8, 3, 9.5], "texture": "#0"},
+				"up": {"uv": [2, 8, 1.5, 7], "texture": "#0"},
+				"down": {"uv": [2.5, 7, 2, 8], "texture": "#0"}
+			}
+		},
+		{
+			"name": "left wing",
+			"from": [2, 14, 4],
+			"to": [7, 14, 10],
+			"rotation": {"angle": 45, "axis": "z", "origin": [11, 12, 9]},
+			"faces": {
+				"north": {"uv": [16, 0, 16, 0], "texture": "#0"},
+				"east": {"uv": [16, 0, 16, 0], "rotation": 270, "texture": "#0"},
+				"south": {"uv": [16, 0, 16, 0], "rotation": 180, "texture": "#0"},
+				"west": {"uv": [16, 0, 16, 0], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [13, 4, 16, 6.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [13, 4, 16, 6.5], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "right wing",
+			"from": [9, 14, 4],
+			"to": [14, 14, 10],
+			"rotation": {"angle": -45, "axis": "z", "origin": [5, 12, 9]},
+			"faces": {
+				"north": {"uv": [16, 0, 16, 0], "texture": "#0"},
+				"east": {"uv": [16, 0, 16, 0], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [16, 0, 16, 0], "rotation": 180, "texture": "#0"},
+				"west": {"uv": [16, 0, 16, 0], "rotation": 270, "texture": "#0"},
+				"up": {"uv": [16, 4, 13, 6.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [13, 6.5, 16, 4], "rotation": 270, "texture": "#0"}
+			}
+		},
 		{
 			"name": "left pectoral",
 			"from": [5, 5, 6],
@@ -91,13 +134,13 @@
 		{
 			"name": "dorsal fin",
 			"from": [7, 9, 5],
-			"to": [9, 14, 8],
+			"to": [9, 13, 8],
 			"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 10, 7]},
 			"faces": {
-				"north": {"uv": [10, 1.5, 11, 4], "texture": "#0"},
-				"east": {"uv": [8.5, 1.5, 10, 4], "texture": "#0"},
-				"south": {"uv": [12.5, 1.5, 13.5, 4], "texture": "#0"},
-				"west": {"uv": [11, 1.5, 12.5, 4], "texture": "#0"},
+				"north": {"uv": [10, 1.5, 11, 3.5], "texture": "#0"},
+				"east": {"uv": [8.5, 1.5, 10, 3.5], "texture": "#0"},
+				"south": {"uv": [12.5, 1.5, 13.5, 3.5], "texture": "#0"},
+				"west": {"uv": [11, 1.5, 12.5, 3.5], "texture": "#0"},
 				"up": {"uv": [11, 1.5, 10, 0], "texture": "#0"},
 				"down": {"uv": [12, 0, 11, 1.5], "texture": "#0"}
 			}
@@ -155,21 +198,47 @@
 		},
 		"ground": {
 			"rotation": [0, 90, 0],
-			"translation": [0, 2, 0],
-			"scale": [0.5, 0.5, 0.5]
+			"translation": [0, 2, 0]
 		},
 		"gui": {
-			"rotation": [30, 135, 0],
+			"rotation": [20, 135, 0],
 			"translation": [0.19, -0.25, 0],
 			"scale": [1.15, 1.15, 1.15]
 		},
 		"head": {
+			"rotation": [22.5, 0, 0],
 			"translation": [0, 9, 0],
-			"scale": [1.25, 1.25, 1.25]
+			"scale": [1.5, 1.5, 1.5]
 		},
 		"fixed": {
 			"rotation": [0, -90, 0],
 			"translation": [0, -1, -3]
 		}
-	}
+	},
+	"groups": [
+		{
+			"name": "blue_shark",
+			"origin": [8, 8, 8],
+			"color": 0,
+			"children": [
+				0,
+				1,
+				2,
+				3,
+				4,
+				{
+					"name": "wings",
+					"origin": [7, 10, 3],
+					"color": 0,
+					"children": [5, 6]
+				},
+				7,
+				8,
+				9,
+				10,
+				11,
+				12
+			]
+		}
+	]
 }

src/main/resources/assets/blahaj/models/item/demiboy_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/demiboy_shork"
+	}
+}

src/main/resources/assets/blahaj/models/item/demigirl_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/demigirl_shork"
+	}
+}

src/main/resources/assets/blahaj/models/item/demiromantic_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/demi_r_shork"
+	}
+}

src/main/resources/assets/blahaj/models/item/demisexual_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/demi_s_shork"
+	}
+}

src/main/resources/assets/blahaj/models/item/enby_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/enby_shork"
+	}
+}

src/main/resources/assets/blahaj/models/item/gay_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/gay_shork"
+	}
+}

src/main/resources/assets/blahaj/models/item/genderfluid_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/genderfluid_shork"
+	}
+}

src/main/resources/assets/blahaj/models/item/genderqueer_shark.json

@@ -0,0 +1,6 @@
+{
+	"parent": "blahaj:item/blue_shark",
+	"textures": {
+		"0": "blahaj:item/genderqueer_shork"
+	}
+}