diff --git a/Art/Models/Crowbar/crowbar.json b/Art/Models/Crowbar/crowbar.json index 115b44d..d956f01 100644 --- a/Art/Models/Crowbar/crowbar.json +++ b/Art/Models/Crowbar/crowbar.json @@ -7,8 +7,9 @@ "elements": [ { "name": "Shaft", - "from": [7.5, 2, 7.5], - "to": [8.5, 15, 8.475], + "from": [7.5, 2, 8.5], + "to": [8.5, 15, 9.475], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 1]}, "faces": { "north": {"uv": [0, 0, 1, 13], "texture": "#0"}, "east": {"uv": [1, 0, 2, 13], "texture": "#0"}, @@ -20,9 +21,9 @@ }, { "name": "BottomTip", - "from": [7.525, 4.7, 6.175], - "to": [8.475, 5.5, 8.075], - "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 0]}, + "from": [7.525, 4.7, 7.175], + "to": [8.475, 5.5, 9.075], + "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 1]}, "faces": { "north": {"uv": [7, 6, 8, 7], "texture": "#0"}, "east": {"uv": [4, 0, 6, 1], "texture": "#0"}, @@ -34,9 +35,9 @@ }, { "name": "TipShaft", - "from": [7.525, 16.375, -0.125], - "to": [8.475, 17.1, 2.1], - "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 0]}, + "from": [7.525, 16.375, 0.875], + "to": [8.475, 17.1, 3.1], + "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 1]}, "faces": { "north": {"uv": [8, 0, 9, 1], "texture": "#0"}, "east": {"uv": [5, 2, 7, 3], "texture": "#0"}, @@ -48,8 +49,9 @@ }, { "name": "TipMiddle", - "from": [7.525, 15.125, 4.8], - "to": [8.475, 15.825, 6.425], + "from": [7.525, 15.125, 5.8], + "to": [8.475, 15.825, 7.425], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 1]}, "faces": { "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, "east": {"uv": [4, 6, 6, 7], "texture": "#0"}, @@ -61,9 +63,9 @@ }, { "name": "TipEnd", - "from": [7.55, 7.1, 12.95], - "to": [8.45, 7.8, 14.575], - "rotation": {"angle": -45, "axis": "x", "origin": [0, 0, 0]}, + "from": [7.55, 7.1, 13.95], + "to": [8.45, 7.8, 15.575], + "rotation": {"angle": -45, "axis": "x", "origin": [0, 0, 1]}, "faces": { "north": {"uv": [6, 8, 7, 9], "texture": "#0"}, "east": {"uv": [7, 2, 9, 3], "texture": "#0"}, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5c93b31..e139f64 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ kotlin = "1.8.22" minecraft = "1.20.1" qfapi = "7.4.0+0.90.0-1.20.1" qkl = "2.1.0+kt.1.8.22+flk.1.9.4" -loader = "0.22.1-beta.1" +loader = "0.23.0-beta.1" mappings = "1.20.1+build.9" loom = "1.2.3" diff --git a/src/main/kotlin/xyz/limepot/block_life/item/ModItems.kt b/src/main/kotlin/xyz/limepot/block_life/item/ModItems.kt index 6781960..3c30f98 100644 --- a/src/main/kotlin/xyz/limepot/block_life/item/ModItems.kt +++ b/src/main/kotlin/xyz/limepot/block_life/item/ModItems.kt @@ -19,15 +19,7 @@ class ModItems { /*TODO: Setup our own custom mineable list, */ QuiltItemSettings()) ) -/* - val HEV_HELMET: Item = - registerItem( - "hev_helmet", - ArmorItem(HEVArmorMaterial.INSTANCE, - , - QuiltItemSettings()) - ) -*/ + //registry template private fun registerItem(name: String, item: Item): Item { BlockLife.LOGGER.debug("Registering " + name) diff --git a/src/main/resources/assets/block_life/models/item/crowbar.json b/src/main/resources/assets/block_life/models/item/crowbar.json index 6c6de7d..d956f01 100644 --- a/src/main/resources/assets/block_life/models/item/crowbar.json +++ b/src/main/resources/assets/block_life/models/item/crowbar.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench & Aseprite", + "credit": "Made with Blockbench", "textures": { "0": "block_life:item/crowbar", "particle": "block_life:item/crowbar" @@ -7,8 +7,9 @@ "elements": [ { "name": "Shaft", - "from": [7.5, 2, 7.5], - "to": [8.5, 15, 8.475], + "from": [7.5, 2, 8.5], + "to": [8.5, 15, 9.475], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 1]}, "faces": { "north": {"uv": [0, 0, 1, 13], "texture": "#0"}, "east": {"uv": [1, 0, 2, 13], "texture": "#0"}, @@ -20,9 +21,9 @@ }, { "name": "BottomTip", - "from": [7.525, 4.7, 6.175], - "to": [8.475, 5.5, 8.075], - "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 0]}, + "from": [7.525, 4.7, 7.175], + "to": [8.475, 5.5, 9.075], + "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 1]}, "faces": { "north": {"uv": [7, 6, 8, 7], "texture": "#0"}, "east": {"uv": [4, 0, 6, 1], "texture": "#0"}, @@ -34,9 +35,9 @@ }, { "name": "TipShaft", - "from": [7.525, 16.375, -0.125], - "to": [8.475, 17.1, 2.1], - "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 0]}, + "from": [7.525, 16.375, 0.875], + "to": [8.475, 17.1, 3.1], + "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 1]}, "faces": { "north": {"uv": [8, 0, 9, 1], "texture": "#0"}, "east": {"uv": [5, 2, 7, 3], "texture": "#0"}, @@ -48,8 +49,9 @@ }, { "name": "TipMiddle", - "from": [7.525, 15.125, 4.8], - "to": [8.475, 15.825, 6.425], + "from": [7.525, 15.125, 5.8], + "to": [8.475, 15.825, 7.425], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 1]}, "faces": { "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, "east": {"uv": [4, 6, 6, 7], "texture": "#0"}, @@ -61,9 +63,9 @@ }, { "name": "TipEnd", - "from": [7.55, 7.1, 12.95], - "to": [8.45, 7.8, 14.575], - "rotation": {"angle": -45, "axis": "x", "origin": [0, 0, 0]}, + "from": [7.55, 7.1, 13.95], + "to": [8.45, 7.8, 15.575], + "rotation": {"angle": -45, "axis": "x", "origin": [0, 0, 1]}, "faces": { "north": {"uv": [6, 8, 7, 9], "texture": "#0"}, "east": {"uv": [7, 2, 9, 3], "texture": "#0"}, @@ -74,4 +76,4 @@ } } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/block_life/models/item/crowbar1.json b/src/main/resources/assets/block_life/models/item/crowbar1.json new file mode 100644 index 0000000..6c6de7d --- /dev/null +++ b/src/main/resources/assets/block_life/models/item/crowbar1.json @@ -0,0 +1,77 @@ +{ + "credit": "Made with Blockbench & Aseprite", + "textures": { + "0": "block_life:item/crowbar", + "particle": "block_life:item/crowbar" + }, + "elements": [ + { + "name": "Shaft", + "from": [7.5, 2, 7.5], + "to": [8.5, 15, 8.475], + "faces": { + "north": {"uv": [0, 0, 1, 13], "texture": "#0"}, + "east": {"uv": [1, 0, 2, 13], "texture": "#0"}, + "south": {"uv": [2, 0, 3, 13], "texture": "#0"}, + "west": {"uv": [3, 0, 4, 13], "texture": "#0"}, + "up": {"uv": [8, 6, 7, 5], "texture": "#0"}, + "down": {"uv": [7, 7, 6, 8], "texture": "#0"} + } + }, + { + "name": "BottomTip", + "from": [7.525, 4.7, 6.175], + "to": [8.475, 5.5, 8.075], + "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 0]}, + "faces": { + "north": {"uv": [7, 6, 8, 7], "texture": "#0"}, + "east": {"uv": [4, 0, 6, 1], "texture": "#0"}, + "south": {"uv": [7, 7, 8, 8], "texture": "#0"}, + "west": {"uv": [4, 1, 6, 2], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 2], "texture": "#0"}, + "down": {"uv": [5, 4, 4, 6], "texture": "#0"} + } + }, + { + "name": "TipShaft", + "from": [7.525, 16.375, -0.125], + "to": [8.475, 17.1, 2.1], + "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 0]}, + "faces": { + "north": {"uv": [8, 0, 9, 1], "texture": "#0"}, + "east": {"uv": [5, 2, 7, 3], "texture": "#0"}, + "south": {"uv": [8, 1, 9, 2], "texture": "#0"}, + "west": {"uv": [5, 3, 7, 4], "texture": "#0"}, + "up": {"uv": [6, 6, 5, 4], "texture": "#0"}, + "down": {"uv": [7, 0, 6, 2], "texture": "#0"} + } + }, + { + "name": "TipMiddle", + "from": [7.525, 15.125, 4.8], + "to": [8.475, 15.825, 6.425], + "faces": { + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [4, 6, 6, 7], "texture": "#0"}, + "south": {"uv": [8, 5, 9, 6], "texture": "#0"}, + "west": {"uv": [6, 4, 8, 5], "texture": "#0"}, + "up": {"uv": [7, 7, 6, 5], "texture": "#0"}, + "down": {"uv": [8, 0, 7, 2], "texture": "#0"} + } + }, + { + "name": "TipEnd", + "from": [7.55, 7.1, 12.95], + "to": [8.45, 7.8, 14.575], + "rotation": {"angle": -45, "axis": "x", "origin": [0, 0, 0]}, + "faces": { + "north": {"uv": [6, 8, 7, 9], "texture": "#0"}, + "east": {"uv": [7, 2, 9, 3], "texture": "#0"}, + "south": {"uv": [8, 6, 9, 7], "texture": "#0"}, + "west": {"uv": [7, 3, 9, 4], "texture": "#0"}, + "up": {"uv": [5, 9, 4, 7], "texture": "#0"}, + "down": {"uv": [6, 7, 5, 9], "texture": "#0"} + } + } + ] +} diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json index 0ddf739..5a44e3f 100644 --- a/src/main/resources/quilt.mod.json +++ b/src/main/resources/quilt.mod.json @@ -27,7 +27,7 @@ "depends": [ { "id": "quilt_loader", - "versions": ">=0.19.2" + "versions": ">=0.23.0-beta.1" }, { "id": "quilted_fabric_api",