From 7c55fdf55ae375bb5f6594cf9024873f4ec7bfeb Mon Sep 17 00:00:00 2001 From: enjarai Date: Wed, 29 May 2024 15:02:59 +0200 Subject: [PATCH] So this work? --- CHANGELOG.md | 4 +- build.gradle | 43 ++++++ gradle.properties | 8 +- .../ed966a455c4849743f9bad7f661ea201bfb98470 | 6 +- .../item/blahaj_skins/prider_shark.json | 6 + .../models/item/blahaj_skins/whale_shark.json | 6 + .../models/item/totem_of_undying.json | 78 +++++----- .../dev/enjarai/blahajtotem/BlahajTotem.java | 5 +- .../dev/enjarai/blahajtotem/BlahajType.java | 7 +- .../blahajtotem/ShorkModelGenerator.java | 2 +- .../assets/blahaj_totem/models/item/whal.json | 134 ++++++++++++++++++ .../item/blahaj_skins/prider_shark.png | Bin 0 -> 1209 bytes .../item/blahaj_skins/trans_shark.png | Bin 524 -> 1136 bytes .../item/blahaj_skins/whale_shark.png | Bin 0 -> 770 bytes src/main/resources/fabric.mod.json | 2 +- 15 files changed, 260 insertions(+), 41 deletions(-) create mode 100644 src/main/generated/assets/blahaj_totem/models/item/blahaj_skins/prider_shark.json create mode 100644 src/main/generated/assets/blahaj_totem/models/item/blahaj_skins/whale_shark.json create mode 100644 src/main/resources/assets/blahaj_totem/models/item/whal.json create mode 100644 src/main/resources/assets/blahaj_totem/textures/item/blahaj_skins/prider_shark.png create mode 100644 src/main/resources/assets/blahaj_totem/textures/item/blahaj_skins/whale_shark.png diff --git a/CHANGELOG.md b/CHANGELOG.md index a71387b..9c1c003 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,3 @@ -- Updated to 1.20.6. \ No newline at end of file +- 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. \ No newline at end of file diff --git a/build.gradle b/build.gradle index 96bec82..0b14fce 100644 --- 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 + } + } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a13772c..30ec0d6 100644 --- 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 index 784facb..bd60242 100644 --- 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 new file mode 100644 index 0000000..09e63e0 --- /dev/null +++ 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" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..31b156e --- /dev/null +++ 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" + } +} \ No newline at end of file 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 index 49fb5ff..60cb358 100644 --- 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 index 2244794..5c56245 100644 --- 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 index 6fce36a..68ace42 100644 --- 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 index 04f8225..6372ef1 100644 --- 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()); diff --git a/src/main/resources/assets/blahaj_totem/models/item/whal.json b/src/main/resources/assets/blahaj_totem/models/item/whal.json new file mode 100644 index 0000000..b0c731d --- /dev/null +++ b/src/main/resources/assets/blahaj_totem/models/item/whal.json @@ -0,0 +1,134 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "blahaj_totem:item/whale", + "particle": "#0" + }, + "elements": [ + { + "name": "tail stabilizer", + "from": [4, 7, 14], + "to": [12, 9, 16], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 9, 15]}, + "faces": { + "north": {"uv": [7, 7, 11, 8], "texture": "#0"}, + "east": {"uv": [6, 7, 7, 8], "texture": "#0"}, + "south": {"uv": [12, 7, 16, 8], "texture": "#0"}, + "west": {"uv": [11, 7, 12, 8], "texture": "#0"}, + "up": {"uv": [11, 7, 7, 6], "texture": "#0"}, + "down": {"uv": [15, 6, 11, 7], "texture": "#0"} + } + }, + { + "name": "right pectoral", + "from": [11, 7, 3], + "to": [15, 8, 5], + "rotation": {"angle": -22.5, "axis": "y", "origin": [11, 7, 3]}, + "faces": { + "north": {"uv": [7, 9, 9, 9.5], "texture": "#0"}, + "east": {"uv": [6, 9, 7, 9.5], "texture": "#0"}, + "south": {"uv": [10, 9, 12, 9.5], "texture": "#0"}, + "west": {"uv": [9, 9, 10, 9.5], "texture": "#0"}, + "up": {"uv": [9, 9, 7, 8], "texture": "#0"}, + "down": {"uv": [11, 8, 9, 9], "texture": "#0"} + } + }, + { + "name": "left pectoral", + "from": [1, 7, 3], + "to": [5, 8, 5], + "rotation": {"angle": 22.5, "axis": "y", "origin": [5, 7, 3]}, + "faces": { + "north": {"uv": [1, 9.5, 3, 10], "texture": "#0"}, + "east": {"uv": [0, 9.5, 1, 10], "texture": "#0"}, + "south": {"uv": [4, 9.5, 6, 10], "texture": "#0"}, + "west": {"uv": [3, 9.5, 4, 10], "texture": "#0"}, + "up": {"uv": [3, 9.5, 1, 8.5], "texture": "#0"}, + "down": {"uv": [5, 8.5, 3, 9.5], "texture": "#0"} + } + }, + { + "name": "whael", + "from": [5, 6, 0], + "to": [11, 10, 8], + "faces": { + "north": {"uv": [4, 4, 7, 6], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 6], "texture": "#0"}, + "south": {"uv": [11, 4, 14, 6], "texture": "#0"}, + "west": {"uv": [7, 4, 11, 6], "texture": "#0"}, + "up": {"uv": [7, 4, 4, 0], "texture": "#0"}, + "down": {"uv": [10, 0, 7, 4], "texture": "#0"} + } + }, + { + "name": "tail", + "from": [6.5, 7, 11], + "to": [9.5, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15.5]}, + "faces": { + "north": {"uv": [1.5, 7.5, 3, 8.5], "texture": "#0"}, + "east": {"uv": [0, 7.5, 1.5, 8.5], "texture": "#0"}, + "south": {"uv": [4.5, 7.5, 6, 8.5], "texture": "#0"}, + "west": {"uv": [3, 7.5, 4.5, 8.5], "texture": "#0"}, + "up": {"uv": [3, 7.5, 1.5, 6], "texture": "#0"}, + "down": {"uv": [4.5, 6, 3, 7.5], "texture": "#0"} + } + }, + { + "name": "dorsal fin", + "from": [7.5, 10, 5], + "to": [8.5, 13, 7], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 10, 5]}, + "faces": { + "north": {"uv": [11, 1, 11.5, 2.5], "texture": "#0"}, + "east": {"uv": [10, 1, 11, 2.5], "texture": "#0"}, + "south": {"uv": [12.5, 1, 13, 2.5], "texture": "#0"}, + "west": {"uv": [11.5, 1, 12.5, 2.5], "texture": "#0"}, + "up": {"uv": [11.5, 1, 11, 0], "texture": "#0"}, + "down": {"uv": [12, 0, 11.5, 1], "texture": "#0"} + } + }, + { + "from": [6, 6.5, 8], + "to": [10, 9.5, 11], + "faces": { + "north": {"uv": [1.5, 11.5, 3.5, 13], "texture": "#0"}, + "east": {"uv": [0, 11.5, 1.5, 13], "texture": "#0"}, + "south": {"uv": [5, 11.5, 7, 13], "texture": "#0"}, + "west": {"uv": [3.5, 11.5, 5, 13], "texture": "#0"}, + "up": {"uv": [3.5, 11.5, 1.5, 10], "texture": "#0"}, + "down": {"uv": [5.5, 10, 3.5, 11.5], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [130, -60, 100], + "translation": [-4, -1.5, 3.25], + "scale": [1.1, 1.1, 1.1] + }, + "firstperson_righthand": { + "rotation": [70, -55, 60], + "translation": [-3.25, 1.25, 1] + }, + "ground": { + "rotation": [0, 90, 0], + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [-0.4, 0, 0], + "scale": [0.98, 0.98, 0.98] + }, + "head": { + "translation": [0, 9, 0], + "scale": [1.25, 1.25, 1.25] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -1, -3] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj_totem/textures/item/blahaj_skins/prider_shark.png b/src/main/resources/assets/blahaj_totem/textures/item/blahaj_skins/prider_shark.png new file mode 100644 index 0000000000000000000000000000000000000000..cd477b2f336191ddb9612d0a41ff32e8fa15ed7d GIT binary patch literal 1209 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 delta 509 zcmV%KVhc|B%S{kHqnaz3qd!=z_N8ezMe!jnImU;d-vkhlg~ezuI%B*Knn8 zpSo$8v}KjBW09+1j;LIUq*jBSQ-PWQ0082x?m++m00DGTPJdGXK<3zH00042Nklw;$Y&1ew-V1gL|h?%)P8} z&<((~Tiw-X!e`>@)W|vBfOZ*|)`harg8CPn89sLY2KbOa<*l0%X4uW&L>Rn1H~3c9 z=7Yvym1GZa0K_3$rT7&`-4{Gk3*m2y9vD<{bbDm|dD9+so zyUIr+Vigh6?Zh7&v_w>e=xrN(ijeZ%j)jEdL4kI@YRtlfx_k$4XlKZW()BxlryevP zmC&L)K;QvR6=gaHx&-GMx8fXFe#&!T{jL50H7*%4CAL4r00000NkvXXu0mjfj!X6u diff --git a/src/main/resources/assets/blahaj_totem/textures/item/blahaj_skins/whale_shark.png b/src/main/resources/assets/blahaj_totem/textures/item/blahaj_skins/whale_shark.png new file mode 100644 index 0000000000000000000000000000000000000000..7b7b0f836a66b940c840f0b5211f70603d53e6d3 GIT binary patch literal 770 zcmV+d1O5DoP)R@vHgeHb0#l=x@EjakGSaoo5*44pP5ClI!TwR4rtTPCUJ7>74h8BdjVHiO-404Z0xlBi9v|-#Aws7IxJkhj(EnoFAEQ8E7ic$a z`}^3o+b4kk8MxBA{*4we^GSNMtHqCi;cejJx~nOBz~v4QebQw^b|gPdp9IT6KHt?BnzS$Wd3B8{ps&7^_hBn#a2bdwcu$OsBsed=PS~FTd1e0000gP)t-s z0002S)7HSw(Ywmcw#La5aKRU8v>0Nh8D507*qoM6N<$f-u)j A1^@s6 literal 0 HcmV?d00001 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8c24b17..73ae334 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,7 +29,7 @@ "depends": { "java": ">=17", "fabric": "*", - "minecraft": ">=1.20" + "minecraft": ">=1.20.5" }, "custom": {