diff --git a/src/main/java/org/prismlauncher/blahaj/Common.java b/src/main/java/org/prismlauncher/blahaj/Common.java index ef25d66..8db35fc 100644 --- a/src/main/java/org/prismlauncher/blahaj/Common.java +++ b/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) -> { diff --git a/src/main/resources/assets/blahaj/lang/en_us.json b/src/main/resources/assets/blahaj/lang/en_us.json index a6d8d58..4fa9c18 100644 --- a/src/main/resources/assets/blahaj/lang/en_us.json +++ b/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", diff --git a/src/main/resources/assets/blahaj/models/item/ace_shark.json b/src/main/resources/assets/blahaj/models/item/ace_shark.json new file mode 100644 index 0000000..fb4d6e2 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/agender_shark.json b/src/main/resources/assets/blahaj/models/item/agender_shark.json new file mode 100644 index 0000000..9565efa --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/aro_shark.json b/src/main/resources/assets/blahaj/models/item/aro_shark.json new file mode 100644 index 0000000..402792c --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/aroace_shark.json b/src/main/resources/assets/blahaj/models/item/aroace_shark.json new file mode 100644 index 0000000..9a30185 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/bi_shark.json b/src/main/resources/assets/blahaj/models/item/bi_shark.json new file mode 100644 index 0000000..8c2f4cf --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/blue_shark.json b/src/main/resources/assets/blahaj/models/item/blue_shark.json index 6016d92..629dea6 100644 --- a/src/main/resources/assets/blahaj/models/item/blue_shark.json +++ b/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 + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/demiboy_shark.json b/src/main/resources/assets/blahaj/models/item/demiboy_shark.json new file mode 100644 index 0000000..47da81e --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/demigirl_shark.json b/src/main/resources/assets/blahaj/models/item/demigirl_shark.json new file mode 100644 index 0000000..40ea47d --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/demiromantic_shark.json b/src/main/resources/assets/blahaj/models/item/demiromantic_shark.json new file mode 100644 index 0000000..d112452 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/demisexual_shark.json b/src/main/resources/assets/blahaj/models/item/demisexual_shark.json new file mode 100644 index 0000000..5e06c01 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/enby_shark.json b/src/main/resources/assets/blahaj/models/item/enby_shark.json new file mode 100644 index 0000000..1cb45f8 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/gay_shark.json b/src/main/resources/assets/blahaj/models/item/gay_shark.json new file mode 100644 index 0000000..cbc13d8 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/genderfluid_shark.json b/src/main/resources/assets/blahaj/models/item/genderfluid_shark.json new file mode 100644 index 0000000..bfabc6b --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/genderqueer_shark.json b/src/main/resources/assets/blahaj/models/item/genderqueer_shark.json new file mode 100644 index 0000000..7d1280c --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/greyromantic_shark.json b/src/main/resources/assets/blahaj/models/item/greyromantic_shark.json new file mode 100644 index 0000000..b965408 --- /dev/null +++ b/src/main/resources/assets/blahaj/models/item/greyromantic_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "blahaj:item/blue_shark", + "textures": { + "0": "blahaj:item/grey_r_shork" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/greyrose_shark.json b/src/main/resources/assets/blahaj/models/item/greyrose_shark.json new file mode 100644 index 0000000..16ead09 --- /dev/null +++ b/src/main/resources/assets/blahaj/models/item/greyrose_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "blahaj:item/blue_shark", + "textures": { + "0": "blahaj:item/greyrose_shork" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/greysexual_shark.json b/src/main/resources/assets/blahaj/models/item/greysexual_shark.json new file mode 100644 index 0000000..2bd25aa --- /dev/null +++ b/src/main/resources/assets/blahaj/models/item/greysexual_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "blahaj:item/blue_shark", + "textures": { + "0": "blahaj:item/grey_s_shork" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/intersex_shark.json b/src/main/resources/assets/blahaj/models/item/intersex_shark.json new file mode 100644 index 0000000..aa88f46 --- /dev/null +++ b/src/main/resources/assets/blahaj/models/item/intersex_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "blahaj:item/blue_shark", + "textures": { + "0": "blahaj:item/intersex_shork" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/lesbian_shark.json b/src/main/resources/assets/blahaj/models/item/lesbian_shark.json new file mode 100644 index 0000000..e81c65e --- /dev/null +++ b/src/main/resources/assets/blahaj/models/item/lesbian_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "blahaj:item/blue_shark", + "textures": { + "0": "blahaj:item/lesbian_shork" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/pan_shark.json b/src/main/resources/assets/blahaj/models/item/pan_shark.json new file mode 100644 index 0000000..b52d106 --- /dev/null +++ b/src/main/resources/assets/blahaj/models/item/pan_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "blahaj:item/blue_shark", + "textures": { + "0": "blahaj:item/pan_shork" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/poly_shark.json b/src/main/resources/assets/blahaj/models/item/poly_shark.json new file mode 100644 index 0000000..8e2844c --- /dev/null +++ b/src/main/resources/assets/blahaj/models/item/poly_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "blahaj:item/blue_shark", + "textures": { + "0": "blahaj:item/poly_shork" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/pride_shark.json b/src/main/resources/assets/blahaj/models/item/pride_shark.json new file mode 100644 index 0000000..8c73e22 --- /dev/null +++ b/src/main/resources/assets/blahaj/models/item/pride_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "blahaj:item/blue_shark", + "textures": { + "0": "blahaj:item/pride_shork" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/item/trans_shark.json b/src/main/resources/assets/blahaj/models/item/trans_shark.json new file mode 100644 index 0000000..48ba9d7 --- /dev/null +++ b/src/main/resources/assets/blahaj/models/item/trans_shark.json @@ -0,0 +1,6 @@ +{ + "parent": "blahaj:item/blue_shark", + "textures": { + "0": "blahaj:item/trans_shork" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/textures/item/ace_shork.png b/src/main/resources/assets/blahaj/textures/item/ace_shork.png new file mode 100644 index 0000000..33b5db2 Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/ace_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/agender_shork.png b/src/main/resources/assets/blahaj/textures/item/agender_shork.png new file mode 100644 index 0000000..f50b34c Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/agender_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/aro_shork.png b/src/main/resources/assets/blahaj/textures/item/aro_shork.png new file mode 100644 index 0000000..c5ca527 Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/aro_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/aroace_shork.png b/src/main/resources/assets/blahaj/textures/item/aroace_shork.png new file mode 100644 index 0000000..5eef759 Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/aroace_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/bi_shork.png b/src/main/resources/assets/blahaj/textures/item/bi_shork.png new file mode 100644 index 0000000..b6466bd Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/bi_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/blue_whale.png b/src/main/resources/assets/blahaj/textures/item/blue_whale.png index 32ea2a8..7b7b0f8 100644 Binary files a/src/main/resources/assets/blahaj/textures/item/blue_whale.png and b/src/main/resources/assets/blahaj/textures/item/blue_whale.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/bred.png b/src/main/resources/assets/blahaj/textures/item/bred.png index 34267db..9247881 100644 Binary files a/src/main/resources/assets/blahaj/textures/item/bred.png and b/src/main/resources/assets/blahaj/textures/item/bred.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/demi_r_shork.png b/src/main/resources/assets/blahaj/textures/item/demi_r_shork.png new file mode 100644 index 0000000..a37e9c7 Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/demi_r_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/demi_s_shork.png b/src/main/resources/assets/blahaj/textures/item/demi_s_shork.png new file mode 100644 index 0000000..2cba441 Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/demi_s_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/demiboy_shork.png b/src/main/resources/assets/blahaj/textures/item/demiboy_shork.png new file mode 100644 index 0000000..a08e373 Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/demiboy_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/demigirl_shork.png b/src/main/resources/assets/blahaj/textures/item/demigirl_shork.png new file mode 100644 index 0000000..e654a61 Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/demigirl_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/enby_shork.png b/src/main/resources/assets/blahaj/textures/item/enby_shork.png new file mode 100644 index 0000000..233c695 Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/enby_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/gay_shork.png b/src/main/resources/assets/blahaj/textures/item/gay_shork.png new file mode 100644 index 0000000..f382656 Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/gay_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/genderfluid_shork.png b/src/main/resources/assets/blahaj/textures/item/genderfluid_shork.png new file mode 100644 index 0000000..ab99a7e Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/genderfluid_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/genderqueer_shork.png b/src/main/resources/assets/blahaj/textures/item/genderqueer_shork.png new file mode 100644 index 0000000..8cc63bf Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/genderqueer_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/gray_shork.png b/src/main/resources/assets/blahaj/textures/item/gray_shork.png index 56c78fe..85a7bc8 100644 Binary files a/src/main/resources/assets/blahaj/textures/item/gray_shork.png and b/src/main/resources/assets/blahaj/textures/item/gray_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/grey_r_shork.png b/src/main/resources/assets/blahaj/textures/item/grey_r_shork.png new file mode 100644 index 0000000..b8cd83d Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/grey_r_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/grey_s_shork.png b/src/main/resources/assets/blahaj/textures/item/grey_s_shork.png new file mode 100644 index 0000000..36ce34d Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/grey_s_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/greyrose_shork.png b/src/main/resources/assets/blahaj/textures/item/greyrose_shork.png new file mode 100644 index 0000000..35b270f Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/greyrose_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/intersex_shork.png b/src/main/resources/assets/blahaj/textures/item/intersex_shork.png new file mode 100644 index 0000000..c8ba4a2 Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/intersex_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/lesbian_shork.png b/src/main/resources/assets/blahaj/textures/item/lesbian_shork.png new file mode 100644 index 0000000..2b7aa70 Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/lesbian_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/pan_shork.png b/src/main/resources/assets/blahaj/textures/item/pan_shork.png new file mode 100644 index 0000000..e8dfa7c Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/pan_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/poly_shork.png b/src/main/resources/assets/blahaj/textures/item/poly_shork.png new file mode 100644 index 0000000..cf1378b Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/poly_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/pride_shork.png b/src/main/resources/assets/blahaj/textures/item/pride_shork.png new file mode 100644 index 0000000..5fbf6fc Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/pride_shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/shork.png b/src/main/resources/assets/blahaj/textures/item/shork.png index 18a058e..d50b43d 100644 Binary files a/src/main/resources/assets/blahaj/textures/item/shork.png and b/src/main/resources/assets/blahaj/textures/item/shork.png differ diff --git a/src/main/resources/assets/blahaj/textures/item/trans_shork.png b/src/main/resources/assets/blahaj/textures/item/trans_shork.png new file mode 100644 index 0000000..175f06d Binary files /dev/null and b/src/main/resources/assets/blahaj/textures/item/trans_shork.png differ