diff --git a/gradle.properties b/gradle.properties index 8bd0ea4..18d311e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx4G org.gradle.daemon=false # -mod_version=0.3.1 +mod_version=0.3.2 mod_id=tomeofblood mod_authors=mystchonky mod_group_id=com.mystchonky.tomeofblood diff --git a/src/main/resources/assets/tomeofblood/geo/living_mage_armor.geo.json b/src/main/resources/assets/tomeofblood/geo/living_mage_armor.geo.json index 64d6d29..ab5e52a 100644 --- a/src/main/resources/assets/tomeofblood/geo/living_mage_armor.geo.json +++ b/src/main/resources/assets/tomeofblood/geo/living_mage_armor.geo.json @@ -5,7 +5,7 @@ "description": { "identifier": "geometry.unknown", "texture_width": 64, - "texture_height": 32, + "texture_height": 64, "visible_bounds_width": 3, "visible_bounds_height": 4, "visible_bounds_offset": [0, 1, 0] @@ -22,23 +22,14 @@ "cubes": [ { "origin": [-4, 24, -4], - "size": [8, 8, 8], + "size": [8, 3, 8], "inflate": 0.75, "uv": { - "north": {"uv": [18, 22], "uv_size": [8, 8]}, - "east": {"uv": [29, 22], "uv_size": [8, 8]}, - "south": {"uv": [29, 22], "uv_size": [8, 8]}, - "west": {"uv": [29, 22], "uv_size": [8, 8]}, - "up": {"uv": [46, 30], "uv_size": [-8, -8]}, - "down": {"uv": [1, 28], "uv_size": [8, -8]} - } - }, - { - "origin": [-4, 24, -4], - "size": [8, 9, 8], - "inflate": 1.1, - "uv": { - "north": {"uv": [10, 23], "uv_size": [8, 9]} + "north": {"uv": [8, 0], "uv_size": [8, 3]}, + "east": {"uv": [0, 0], "uv_size": [8, 3]}, + "south": {"uv": [24, 0], "uv_size": [8, 3]}, + "west": {"uv": [16, 0], "uv_size": [8, 3]}, + "down": {"uv": [0, 11], "uv_size": [8, -8]} } } ] @@ -57,10 +48,10 @@ "size": [8, 12, 4], "inflate": 0.5, "uv": { - "north": {"uv": [1, 2], "uv_size": [8, 12]}, - "east": {"uv": [14, 0], "uv_size": [-5, 14]}, - "south": {"uv": [14, 0], "uv_size": [9, 14]}, - "west": {"uv": [9, 0], "uv_size": [5, 14]} + "north": {"uv": [44, 0], "uv_size": [8, 12]}, + "east": {"uv": [56, 0], "uv_size": [-4, 12]}, + "south": {"uv": [56, 0], "uv_size": [8, 12]}, + "west": {"uv": [52, 0], "uv_size": [4, 12]} } }, { @@ -68,24 +59,11 @@ "size": [8, 13, 4], "inflate": 1, "uv": { - "north": {"uv": [38, 0], "uv_size": [8, 13]}, - "east": {"uv": [49, 0], "uv_size": [4, 13]}, - "south": {"uv": [47, 0], "uv_size": [8, 13]}, - "west": {"uv": [53, 0], "uv_size": [-4, 13]} - } - }, - { - "origin": [-3, 9.5, -2.75], - "size": [6, 5, 1], - "pivot": [0, 18.5, -2], - "rotation": [-2.5, 0, 0], - "uv": { - "north": {"uv": [12, 14], "uv_size": [6, 5]}, - "east": {"uv": [12, 14], "uv_size": [-1, 5]}, - "south": {"uv": [18, 14], "uv_size": [-6, 5]}, - "west": {"uv": [11, 14], "uv_size": [1, 5]}, - "up": {"uv": [12, 20], "uv_size": [6, -1]}, - "down": {"uv": [18, 20], "uv_size": [-6, -1]} + "north": {"uv": [8, 3], "uv_size": [8, 13]}, + "east": {"uv": [16, 3], "uv_size": [4, 13]}, + "south": {"uv": [20, 3], "uv_size": [8, 13]}, + "west": {"uv": [20, 3], "uv_size": [-4, 13]}, + "up": {"uv": [8, 15], "uv_size": [-8, -4]} } } ] @@ -104,34 +82,11 @@ "size": [4, 10, 4], "inflate": 0.5, "uv": { - "north": {"uv": [23, 2], "uv_size": [4, 10]}, - "east": {"uv": [27, 2], "uv_size": [-4, 10]}, - "south": {"uv": [27, 2], "uv_size": [-4, 10]}, - "west": {"uv": [27, 2], "uv_size": [-4, 10]}, - "up": {"uv": [8, 14], "uv_size": [-4, 4]} - } - }, - { - "origin": [-8, 14, -2], - "size": [4, 11, 4], - "inflate": 0.75, - "uv": { - "north": {"uv": [52, 21], "uv_size": [4, 11]}, - "east": {"uv": [48, 21], "uv_size": [4, 11]} - } - }, - { - "origin": [-9.5, 20.75, -1.5], - "size": [1, 5, 3], - "pivot": [-10, 20.75, 0], - "rotation": [0, 0, 12.5], - "uv": { - "north": {"uv": [29, 5], "uv_size": [1, -5]}, - "east": {"uv": [30, 0], "uv_size": [3, 5]}, - "south": {"uv": [29, 5], "uv_size": [1, -5]}, - "west": {"uv": [30, 0], "uv_size": [3, 5]}, - "up": {"uv": [31, 5], "uv_size": [-1, -3]}, - "down": {"uv": [33, 2], "uv_size": [-1, 3]} + "north": {"uv": [32, 3], "uv_size": [4, 10]}, + "east": {"uv": [32, 3], "uv_size": [-4, 10]}, + "south": {"uv": [44, 3], "uv_size": [-4, 10]}, + "west": {"uv": [36, 3], "uv_size": [4, 10]}, + "up": {"uv": [32, 13], "uv_size": [-4, 4]} } } ] @@ -150,34 +105,11 @@ "size": [4, 10, 4], "inflate": 0.5, "uv": { - "north": {"uv": [29, 2], "uv_size": [-4, 10]}, - "east": {"uv": [28, 2], "uv_size": [-4, 10]}, - "south": {"uv": [25, 2], "uv_size": [4, 10]}, - "west": {"uv": [24, 2], "uv_size": [4, 10]}, - "up": {"uv": [4, 14], "uv_size": [4, 4]} - } - }, - { - "origin": [4, 14, -2], - "size": [4, 11, 4], - "inflate": 0.75, - "uv": { - "north": {"uv": [56, 32], "uv_size": [-4, -11]}, - "west": {"uv": [52, 32], "uv_size": [-4, -11]} - } - }, - { - "origin": [8.5, 20.75, -1.5], - "size": [1, 5, 3], - "pivot": [10, 20.75, 0], - "rotation": [0, 0, -12.5], - "uv": { - "north": {"uv": [29, 5], "uv_size": [1, -5]}, - "east": {"uv": [30, 0], "uv_size": [3, 5]}, - "south": {"uv": [29, 5], "uv_size": [1, -5]}, - "west": {"uv": [30, 0], "uv_size": [3, 5]}, - "up": {"uv": [31, 5], "uv_size": [-1, -3]}, - "down": {"uv": [33, 2], "uv_size": [-1, 3]} + "north": {"uv": [36, 3], "uv_size": [-4, 10]}, + "east": {"uv": [40, 3], "uv_size": [-4, 10]}, + "south": {"uv": [40, 3], "uv_size": [4, 10]}, + "west": {"uv": [28, 3], "uv_size": [4, 10]}, + "up": {"uv": [28, 13], "uv_size": [4, 4]} } } ] @@ -193,26 +125,27 @@ "cubes": [ { "origin": [-4, 4, -2], - "size": [4, 9, 4], + "size": [4, 8, 4], "inflate": 0.8, "pivot": [2, 12, 0], - "rotation": [0, 0, 10], + "rotation": [0, 0, 7.5], "uv": { - "north": {"uv": [4, 15], "uv_size": [-4, 9]}, - "east": {"uv": [8, 15], "uv_size": [-4, 9]}, - "south": {"uv": [0, 15], "uv_size": [4, 9]}, - "up": {"uv": [4, 19], "uv_size": [-4, -4]} + "north": {"uv": [4, 16], "uv_size": [-4, 8]}, + "east": {"uv": [8, 16], "uv_size": [-4, 8]}, + "south": {"uv": [12, 16], "uv_size": [-4, 8]}, + "up": {"uv": [16, 20], "uv_size": [-4, -4]} } }, { - "origin": [-4, 6, -2], + "origin": [-4, 5, -2], "size": [4, 7, 4], "inflate": 0.5, "uv": { - "north": {"uv": [34, 1], "uv_size": [4, 7]}, - "east": {"uv": [34, 1], "uv_size": [4, 7]}, - "south": {"uv": [34, 1], "uv_size": [4, 7]}, - "west": {"uv": [34, 1], "uv_size": [4, 7]} + "north": {"uv": [32, 13], "uv_size": [4, 7]}, + "east": {"uv": [32, 13], "uv_size": [4, 7]}, + "south": {"uv": [32, 13], "uv_size": [4, 7]}, + "west": {"uv": [32, 13], "uv_size": [4, 7]}, + "up": {"uv": [40, 17], "uv_size": [-4, -4]} } } ] @@ -224,14 +157,14 @@ "cubes": [ { "origin": [-4, 0, -2], - "size": [4, 5, 4], + "size": [4, 4, 4], "inflate": 0.5, "uv": { - "north": {"uv": [34, 7], "uv_size": [4, 5]}, - "east": {"uv": [38, 7], "uv_size": [-4, 5]}, - "south": {"uv": [34, 7], "uv_size": [4, 5]}, - "west": {"uv": [34, 7], "uv_size": [4, 5]}, - "down": {"uv": [34, 6], "uv_size": [4, -4]} + "north": {"uv": [40, 14], "uv_size": [4, 4]}, + "east": {"uv": [44, 14], "uv_size": [-4, 4]}, + "south": {"uv": [40, 14], "uv_size": [4, 4]}, + "west": {"uv": [40, 14], "uv_size": [4, 4]}, + "down": {"uv": [44, 18], "uv_size": [4, -4]} } } ] @@ -247,26 +180,27 @@ "cubes": [ { "origin": [0, 4, -2], - "size": [4, 9, 4], + "size": [4, 8, 4], "inflate": 0.8, "pivot": [-2, 12, 0], - "rotation": [0, 0, -10], + "rotation": [0, 0, -7.5], "uv": { - "north": {"uv": [0, 15], "uv_size": [4, 9]}, - "south": {"uv": [4, 15], "uv_size": [-4, 9]}, - "west": {"uv": [4, 15], "uv_size": [4, 9]}, - "up": {"uv": [0, 18], "uv_size": [4, -4]} + "north": {"uv": [0, 16], "uv_size": [4, 8]}, + "south": {"uv": [8, 16], "uv_size": [4, 8]}, + "west": {"uv": [4, 16], "uv_size": [4, 8]}, + "up": {"uv": [12, 20], "uv_size": [4, -4]} } }, { - "origin": [0, 6, -2], + "origin": [0, 5, -2], "size": [4, 7, 4], "inflate": 0.5, "uv": { - "north": {"uv": [38, 1], "uv_size": [-4, 7]}, - "east": {"uv": [38, 1], "uv_size": [-4, 7]}, - "south": {"uv": [38, 1], "uv_size": [-4, 7]}, - "west": {"uv": [38, 1], "uv_size": [-4, 7]} + "north": {"uv": [36, 13], "uv_size": [-4, 7]}, + "east": {"uv": [36, 13], "uv_size": [-4, 7]}, + "south": {"uv": [36, 13], "uv_size": [-4, 7]}, + "west": {"uv": [36, 13], "uv_size": [-4, 7]}, + "up": {"uv": [36, 17], "uv_size": [4, -4]} } } ] @@ -278,14 +212,14 @@ "cubes": [ { "origin": [0, 0, -2], - "size": [4, 5, 4], + "size": [4, 4, 4], "inflate": 0.5, "uv": { - "north": {"uv": [38, 7], "uv_size": [-4, 5]}, - "east": {"uv": [34, 7], "uv_size": [4, 5]}, - "south": {"uv": [38, 7], "uv_size": [-4, 5]}, - "west": {"uv": [34, 7], "uv_size": [4, 5]}, - "down": {"uv": [38, 6], "uv_size": [-4, -4]} + "north": {"uv": [44, 14], "uv_size": [-4, 4]}, + "east": {"uv": [40, 14], "uv_size": [4, 4]}, + "south": {"uv": [44, 14], "uv_size": [-4, 4]}, + "west": {"uv": [40, 14], "uv_size": [4, 4]}, + "down": {"uv": [48, 18], "uv_size": [-4, -4]} } } ] diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor.png index 9ff384c..a5c5cc6 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_black.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_black.png index 51680fa..93a2dd7 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_black.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_black.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_blue.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_blue.png index 618391e..0ba793b 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_blue.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_blue.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_brown.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_brown.png index 67c37fa..a14fa4b 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_brown.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_brown.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_cyan.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_cyan.png index fb2e972..7ada51f 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_cyan.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_cyan.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_gray.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_gray.png index aef1cee..15eb003 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_gray.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_gray.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_green.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_green.png index b623aa6..030dcea 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_green.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_green.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_light_blue.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_light_blue.png index 0db55d5..c189410 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_light_blue.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_light_blue.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_light_gray.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_light_gray.png index f785673..72e2d78 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_light_gray.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_light_gray.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_lime.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_lime.png index e30cb89..a6ca257 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_lime.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_lime.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_magenta.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_magenta.png index 8b22c08..ed898dc 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_magenta.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_magenta.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_orange.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_orange.png index 306193b..7236ea9 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_orange.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_orange.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_pink.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_pink.png index 5ddb7f5..f7d9606 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_pink.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_pink.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_purple.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_purple.png index 483628e..4142c6d 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_purple.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_purple.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_red.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_red.png index 9ff384c..a5c5cc6 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_red.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_red.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_white.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_white.png index 3912628..abb1ee9 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_white.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_white.png differ diff --git a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_yellow.png b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_yellow.png index dfff4cc..f01a27a 100644 Binary files a/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_yellow.png and b/src/main/resources/assets/tomeofblood/textures/item/living_mage_armor/living_mage_armor_yellow.png differ