Clovers

pyproject.toml

@@ -32,7 +32,7 @@ key = "mod_version"
 
 [tool.hatch.metadata.hooks.gradle-properties]
 dependencies = [
-    { package="hexdoc-hexcasting", op="~=", py-version="1.0.dev20", key="hexcastingVersion" },
+    { package="hexdoc-hexcasting", op="~=", py-version="1.0.dev20", key="hexcasting_version" },
 ]
 
 [tool.hatch.metadata.hooks.gradle-properties.optional-dependencies]
@@ -115,4 +115,4 @@ reportUnusedClass = "warning"
 reportUnusedExpression = "warning"
 reportUnusedFunction = "warning"
 reportUnusedImport = "warning"
-reportUnusedVariable = "warning"
+reportUnusedVariable = "warning"

src/main/java/miyucomics/hexical/registry/HexicalItems.kt

@@ -58,7 +58,7 @@ object HexicalItems {
 		ModelPredicateProviderRegistry.register(SMALL_LIVING_SCROLL_ITEM, Identifier("aged")) { stack: ItemStack, _: ClientWorld?, _: LivingEntity?, _: Int -> if (stack.orCreateNbt.getBoolean("aged")) 1f else 0f }
 		ModelPredicateProviderRegistry.register(MEDIUM_LIVING_SCROLL_ITEM, Identifier("aged")) { stack: ItemStack, _: ClientWorld?, _: LivingEntity?, _: Int -> if (stack.orCreateNbt.getBoolean("aged")) 1f else 0f }
 		ModelPredicateProviderRegistry.register(LARGE_LIVING_SCROLL_ITEM, Identifier("aged")) { stack: ItemStack, _: ClientWorld?, _: LivingEntity?, _: Int -> if (stack.orCreateNbt.getBoolean("aged")) 1f else 0f }
-		ModelPredicateProviderRegistry.register(CONJURED_STAFF_ITEM, Identifier("sprite")) { stack: ItemStack, _: ClientWorld?, _: LivingEntity?, _: Int -> stack.orCreateNbt.getFloat("sprite") }
+		ModelPredicateProviderRegistry.register(CONJURED_STAFF_ITEM, Identifier("sprite")) { stack: ItemStack, _: ClientWorld?, _: LivingEntity?, _: Int -> stack.orCreateNbt.getFloat("sprite") / 10 }
 		ModelPredicateProviderRegistry.register(CONJURED_COMPASS_ITEM, Identifier("angle"), CompassAnglePredicateProvider(CompassTarget { _: ClientWorld?, stack: ItemStack?, player: Entity? ->
 			if (player != null && stack != null && stack.hasNbt()) {
 				val nbt = stack.nbt!!

src/main/resources/assets/hexical/models/item/conjured_staff.json

@@ -1,18 +1,24 @@
 {
 	"parent": "minecraft:item/handheld_rod",
 	"textures": {
-		"layer0": "hexical:item/conjured_staff/staff"
+		"layer0": "hexical:item/conjured_staff"
 	},
 	"overrides": [
 		{
 			"predicate": {
-				"sprite": 0.5
+				"sprite": 0.1
+			},
+			"model": "hexical:item/conjured_staff_clover"
+		},
+		{
+			"predicate": {
+				"sprite": 0.2
 			},
 			"model": "hexical:item/conjured_staff_handbell"
 		},
 		{
 			"predicate": {
-				"sprite": 1
+				"sprite": 0.3
 			},
 			"model": "hexical:item/conjured_staff_key"
 		}

src/main/resources/assets/hexical/models/item/conjured_staff_clover.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "hexical:item/conjured_staff_clover"
+	}
+}

src/main/resources/assets/hexical/models/item/conjured_staff_handbell.json

@@ -1,6 +1,6 @@
 {
 	"parent": "minecraft:item/generated",
 	"textures": {
-		"layer0": "hexical:item/conjured_staff/key"
+		"layer0": "hexical:item/conjured_staff_handbell"
 	}
 }

src/main/resources/assets/hexical/models/item/conjured_staff_key.json

@@ -1,6 +1,6 @@
 {
 	"parent": "minecraft:item/generated",
 	"textures": {
-		"layer0": "hexical:item/conjured_staff/handbell"
+		"layer0": "hexical:item/conjured_staff_key"
 	}
 }